|
@@ -33,13 +33,13 @@ UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade"
|
33
|
33
|
|
34
|
34
|
function create_upgrade_script {
|
35
|
35
|
if [ -f /usr/local/bin/${PROJECT_NAME}-upgrade ]; then
|
36
|
|
- cp /usr/local/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
|
|
36
|
+ cp /usr/local/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
|
37
|
37
|
else
|
38
|
|
- cp /usr/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
|
|
38
|
+ cp /usr/bin/${PROJECT_NAME}-upgrade /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
|
39
|
39
|
fi
|
40
|
40
|
|
41
|
41
|
if grep -Fxq "create_upgrade_script" $COMPLETION_FILE; then
|
42
|
|
- return
|
|
42
|
+ return
|
43
|
43
|
fi
|
44
|
44
|
|
45
|
45
|
apt-get -y install unattended-upgrades
|
|
@@ -49,10 +49,10 @@ function create_upgrade_script {
|
49
|
49
|
|
50
|
50
|
function upgrade_installation {
|
51
|
51
|
if [ ! -f $COMPLETION_FILE ]; then
|
52
|
|
- return
|
|
52
|
+ return
|
53
|
53
|
fi
|
54
|
54
|
if grep -Fxq "upgrade_installation" $COMPLETION_FILE; then
|
55
|
|
- return
|
|
55
|
+ return
|
56
|
56
|
fi
|
57
|
57
|
|
58
|
58
|
# upgrade from previous versions to stockholm
|
|
@@ -66,6 +66,10 @@ function upgrade_installation {
|
66
|
66
|
sed -i 's|install_tox_node|install_tox|g' $COMPLETION_FILE
|
67
|
67
|
sed -i 's|intrusion_detection|install_tripwire|g' $COMPLETION_FILE
|
68
|
68
|
|
|
69
|
+ if [ -f /usr/local/bin/zeronetavahi ]; then
|
|
70
|
+ rm /usr/local/bin/zeronetavahi
|
|
71
|
+ fi
|
|
72
|
+
|
69
|
73
|
echo 'upgrade_installation' >> $COMPLETION_FILE
|
70
|
74
|
}
|
71
|
75
|
|