diff --git a/install.sh b/install.sh index 379e855..964c115 100755 --- a/install.sh +++ b/install.sh @@ -40,7 +40,7 @@ function install_host() { echo "debian-bash has been deprecated!" echo "--------------------------------" - read -rn1 -p 'Would you like to migrate to the new project named `miaou-bash`, (yN)?' answer + read -rn1 -p 'Would you like to migrate to the new project named `miaou-bash`, (yN)?' answer if [[ "$answer" == 'y' ]];then pushd /tmp pushd /opt/debian-bash diff --git a/tools/debian_bash_upgrade b/tools/debian_bash_upgrade index 89c0381..9034257 100755 --- a/tools/debian_bash_upgrade +++ b/tools/debian_bash_upgrade @@ -1,6 +1,6 @@ #!/bin/bash -set -Eeuo pipefail +# set -Eeuo pipefail if [[ -d /opt/debian-bash ]]; then local_release=$(cat /opt/debian-bash/.semver_git_tag) @@ -12,22 +12,9 @@ echo -n "$remote_release" if [[ $local_release != $remote_release ]]; then echo " , upgrading from <$local_release> to <$remote_release> ..." - curl https://git.artcode.re/pvincent/debian-bash/raw/branch/master/install.sh | sudo bash -s -- --full + curl https://git.artcode.re/pvincent/debian-bash/raw/branch/master/install.sh | sudo bash -s -- --host + pushd /opt/debian-bash + ./install.sh --host else echo " up-to-date!" - # install inside active LXC containers - if [[ -f '/snap/bin/lxc' ]]; then - echo "debian-bash: refreshing containers ..." - for container in $(lxc list --format=json | yq '.[] | select(.state.status == "Running") | .name' -); do - container_release=$(lxc exec $container -- cat /opt/debian-bash/.semver_git_tag) - if [[ $container_release != $remote_release ]]; then - echo "upgrade container <$container> from <$container_release> to <$remote_release>" - /snap/bin/lxc file push /opt/debian-bash "${container}/opt/" -r - else - echo -e "\\tcontainer <$container> already up-to-date!" - fi - done - echo DONE - fi - fi