Browse Source

Upgrade completion file to stockholm

Bob Mottram 8 years ago
parent
commit
6a78b77d52
2 changed files with 33 additions and 10 deletions
  1. 1
    0
      src/freedombone
  2. 32
    10
      src/freedombone-utils-upgrade

+ 1
- 0
src/freedombone View File

@@ -280,6 +280,7 @@ if [ ! "$?" = "0" ]; then
280 280
 	exit 768252
281 281
 fi
282 282
 
283
+upgrade_installation
283 284
 setup_utils
284 285
 setup_email
285 286
 setup_web

+ 32
- 10
src/freedombone-utils-upgrade View File

@@ -32,19 +32,41 @@
32 32
 UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade"
33 33
 
34 34
 function create_upgrade_script {
35
-	if [ -f /usr/local/bin/${PROJECT_NAME}-upgrade ]; then
36
-		cp /usr/local/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
37
-	else
38
-		cp /usr/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
39
-	fi
35
+    if [ -f /usr/local/bin/${PROJECT_NAME}-upgrade ]; then
36
+	cp /usr/local/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
37
+    else
38
+	cp /usr/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
39
+    fi
40 40
 
41
-	if grep -Fxq "create_upgrade_script" $COMPLETION_FILE; then
42
-		return
43
-	fi
41
+    if grep -Fxq "create_upgrade_script" $COMPLETION_FILE; then
42
+	return
43
+    fi
44 44
 
45
-	apt-get -y install unattended-upgrades
45
+    apt-get -y install unattended-upgrades
46 46
 
47
-	echo 'create_upgrade_script' >> $COMPLETION_FILE
47
+    echo 'create_upgrade_script' >> $COMPLETION_FILE
48
+}
49
+
50
+function upgrade_installation {
51
+    if [ ! -f $COMPLETION_FILE ]; then
52
+	return
53
+    fi
54
+    if grep -Fxq "upgrade_installation" $COMPLETION_FILE; then
55
+	return
56
+    fi
57
+
58
+    # upgrade from previous versions to stockholm
59
+    sed -i 's|configure_email|install_email|g' $COMPLETION_FILE
60
+    sed -i 's|install_dlna_server|install_dlna|g' $COMPLETION_FILE
61
+    sed -i 's|install_gnu_social_theme|install_gnusocial_theme|g' $COMPLETION_FILE
62
+    sed -i 's|install_gnu_social|install_gnusocial|g' $COMPLETION_FILE
63
+    sed -i 's|install_irc_server|install_irc|g' $COMPLETION_FILE
64
+    sed -i 's|install_voip|install_mumble|g' $COMPLETION_FILE
65
+    sed -i 's|install_rss_reader|install_rss|g' $COMPLETION_FILE
66
+    sed -i 's|install_tox_node|install_tox|g' $COMPLETION_FILE
67
+    sed -i 's|intrusion_detection|install_tripwire|g' $COMPLETION_FILE
68
+
69
+    echo 'upgrade_installation' >> $COMPLETION_FILE
48 70
 }
49 71
 
50 72
 # NOTE: deliberately no exit 0