Skip to content

Commit

Permalink
Bump version to 0.7.0beta4
Browse files Browse the repository at this point in the history
  • Loading branch information
paradigm committed Nov 18, 2018
1 parent 1f42809 commit 6bb47d7
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
#
# make check

VERSION=0.7.0beta3
VERSION=0.7.0beta4
CODENAME=Poki
ARCH=$(shell uname -m)
RELEASE=Bedrock Linux $(VERSION) $(CODENAME)
Expand Down
4 changes: 2 additions & 2 deletions releases
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
###################
# Current release #
###################
https://github.com/bedrocklinux/bedrocklinux-userland/releases/download/0.7.0beta3/bedrock-linux-0.7.0beta3-x86_64.sh

https://github.com/bedrocklinux/bedrocklinux-userland/releases/download/0.7.0beta4/bedrock-linux-0.7.0beta4-x86_64.sh

#################
# Past releases #
#################
https://github.com/bedrocklinux/bedrocklinux-userland/releases/download/0.7.0beta3/bedrock-linux-0.7.0beta3-x86_64.sh
https://github.com/bedrocklinux/bedrocklinux-userland/releases/download/0.7.0beta2/bedrock-linux-0.7.0beta2-x86_64.sh
https://github.com/bedrocklinux/bedrocklinux-userland/releases/download/0.7.0beta1/bedrock-linux-0.7.0beta1-x86_64.sh
27 changes: 25 additions & 2 deletions src/installer/installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,38 @@ update() {
echo "${new_sha1sum}" >/bedrock/var/conf-sha1sum

step "Running post-install steps"
# Reserved for future use

if ver_cmp_first_newer "0.7.0beta4" "${current_version}"; then
# Busybox utility list was updated in 0.7.0beta3, but their symlinks were not changed.
# Ensure new utilities have their symlinks.
/bedrock/libexec/busybox --list-full | while read -r applet; do
strat bedrock /bedrock/libexec/busybox rm -f "/${applet}"
done
strat bedrock /bedrock/libexec/busybox --install -s
fi

notice "Successfully updated to ${new_version}"
new_crossfs=false
new_etcfs=false

if ver_cmp_first_newer "0.7.0beta3" "${current_version}"; then
notice "Updated crossfs. Cannot restart Bedrock FUSE filesystems live. Reboot to complete change."
new_crossfs=true
notice "Added brl-fetch-mirrors section to bedrock.conf. This can be used to specify preferred mirrors to use with brl-fetch."
fi

if ver_cmp_first_newer "0.7.0beta4" "${current_version}"; then
new_crossfs=true
new_etcfs=true
notice "Added ${color_cmd}brl copy${color_norm}."
notice "${color_alert}New, required section added to bedrock.conf. Merge new config with existing and reboot.${color_norm}"
fi

if "${new_crossfs}"; then
notice "Updated crossfs. Cannot restart Bedrock FUSE filesystems live. Reboot to complete change."
fi
if "${new_etcfs}"; then
notice "Updated etcfs. Cannot restart Bedrock FUSE filesystems live. Reboot to complete change."
fi
if "${new_conf}"; then
notice "New reference configuration created at ${color_file}/bedrock/etc/bedrock.conf-${new_version}${color_norm}."
notice "Compare against ${color_file}/bedrock/etc/bedrock.conf${color_norm} and consider merging changes."
Expand Down

0 comments on commit 6bb47d7

Please sign in to comment.