From 6a78b77d523b786fa9a48543f9802735480e5f85 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 24 Jul 2016 11:01:56 +0100 Subject: [PATCH] Upgrade completion file to stockholm --- src/freedombone | 1 + src/freedombone-utils-upgrade | 42 ++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/freedombone b/src/freedombone index 6efbc14d..2dd9b119 100755 --- a/src/freedombone +++ b/src/freedombone @@ -280,6 +280,7 @@ if [ ! "$?" = "0" ]; then exit 768252 fi +upgrade_installation setup_utils setup_email setup_web diff --git a/src/freedombone-utils-upgrade b/src/freedombone-utils-upgrade index 4eca8cac..0475ac6a 100755 --- a/src/freedombone-utils-upgrade +++ b/src/freedombone-utils-upgrade @@ -32,19 +32,41 @@ UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade" function create_upgrade_script { - if [ -f /usr/local/bin/${PROJECT_NAME}-upgrade ]; then - cp /usr/local/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME - else - cp /usr/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME - fi + if [ -f /usr/local/bin/${PROJECT_NAME}-upgrade ]; then + cp /usr/local/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME + else + cp /usr/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME + fi - if grep -Fxq "create_upgrade_script" $COMPLETION_FILE; then - return - fi + if grep -Fxq "create_upgrade_script" $COMPLETION_FILE; then + return + fi - apt-get -y install unattended-upgrades + apt-get -y install unattended-upgrades - echo 'create_upgrade_script' >> $COMPLETION_FILE + echo 'create_upgrade_script' >> $COMPLETION_FILE +} + +function upgrade_installation { + if [ ! -f $COMPLETION_FILE ]; then + return + fi + if grep -Fxq "upgrade_installation" $COMPLETION_FILE; then + return + fi + + # upgrade from previous versions to stockholm + sed -i 's|configure_email|install_email|g' $COMPLETION_FILE + sed -i 's|install_dlna_server|install_dlna|g' $COMPLETION_FILE + sed -i 's|install_gnu_social_theme|install_gnusocial_theme|g' $COMPLETION_FILE + sed -i 's|install_gnu_social|install_gnusocial|g' $COMPLETION_FILE + sed -i 's|install_irc_server|install_irc|g' $COMPLETION_FILE + sed -i 's|install_voip|install_mumble|g' $COMPLETION_FILE + sed -i 's|install_rss_reader|install_rss|g' $COMPLETION_FILE + sed -i 's|install_tox_node|install_tox|g' $COMPLETION_FILE + sed -i 's|intrusion_detection|install_tripwire|g' $COMPLETION_FILE + + echo 'upgrade_installation' >> $COMPLETION_FILE } # NOTE: deliberately no exit 0