瀏覽代碼

Improve upgrades

So that commit changes are checked
Bob Mottram 7 年之前
父節點
當前提交
18c7ca866a

+ 5
- 0
src/freedombone-app-etherpad 查看文件

@@ -302,6 +302,11 @@ function reconfigure_etherpad {
302 302
 }
303 303
 
304 304
 function upgrade_etherpad {
305
+    CURR_ETHERPAD_COMMIT=$(get_completion_param "etherpad commit")
306
+    if [[ "$CURR_ETHERPAD_COMMIT" == "$ETHERPAD_COMMIT" ]]; then
307
+        return
308
+    fi
309
+
305 310
     read_config_param "ETHERPAD_DOMAIN_NAME"
306 311
 
307 312
     function_check set_repo_commit

+ 5
- 0
src/freedombone-app-friendica 查看文件

@@ -213,6 +213,11 @@ function reconfigure_friendica {
213 213
 }
214 214
 
215 215
 function upgrade_friendica {
216
+    CURR_FRIENDICA_COMMIT=$(get_completion_param "friendica commit")
217
+    if [[ "$CURR_FRIENDICA_COMMIT" == "$FRIENDICA_COMMIT" ]]; then
218
+        return
219
+    fi
220
+
216 221
     FRIENDICA_PATH=/var/www/$FRIENDICA_DOMAIN_NAME/htdocs
217 222
 
218 223
     function_check set_repo_commit

+ 5
- 0
src/freedombone-app-htmly 查看文件

@@ -192,6 +192,11 @@ function reconfigure_htmly {
192 192
 }
193 193
 
194 194
 function upgrade_htmly {
195
+    CURR_HTMLY_COMMIT=$(get_completion_param "htmly commit")
196
+    if [[ "$CURR_HTMLY_COMMIT" == "$HTMLY_COMMIT" ]]; then
197
+        return
198
+    fi
199
+
195 200
     read_config_param "HTMLY_DOMAIN_NAME"
196 201
 
197 202
     function_check set_repo_commit

+ 5
- 0
src/freedombone-app-hubzilla 查看文件

@@ -196,6 +196,11 @@ function reconfigure_hubzilla {
196 196
 }
197 197
 
198 198
 function upgrade_hubzilla {
199
+    CURR_HUBZILLA_COMMIT=$(get_completion_param "hubzilla commit")
200
+    if [[ "$CURR_HUBZILLA_COMMIT" == "$HUBZILLA_COMMIT" ]]; then
201
+        return
202
+    fi
203
+
199 204
     HUBZILLA_PATH=/var/www/$HUBZILLA_DOMAIN_NAME/htdocs
200 205
 
201 206
     function_check set_repo_commit

+ 5
- 0
src/freedombone-app-ipfs 查看文件

@@ -58,6 +58,11 @@ function reconfigure_ipfs {
58 58
 }
59 59
 
60 60
 function upgrade_ipfs_go {
61
+    CURR_IPFS_COMMIT=$(get_completion_param "ipfs commit")
62
+    if [[ "$CURR_IPFS_COMMIT" == "$IPFS_COMMIT" ]]; then
63
+        return
64
+    fi
65
+
61 66
     if [[ $(app_is_installed ipfs_go) == "0" ]]; then
62 67
         return
63 68
     fi

+ 8
- 3
src/freedombone-app-librevault 查看文件

@@ -55,6 +55,11 @@ function reconfigure_librevault {
55 55
 }
56 56
 
57 57
 function upgrade_librevault {
58
+    CURR_LIBREVAULT_COMMIT=$(get_completion_param "librevault commit")
59
+    if [[ "$CURR_LIBREVAULT_COMMIT" == "$LIBREVAULT_COMMIT" ]]; then
60
+        return
61
+    fi
62
+
58 63
     function_check set_repo_commit
59 64
 
60 65
     if [ -d $INSTALL_DIR/protobuf ]; then
@@ -71,8 +76,8 @@ function upgrade_librevault {
71 76
     fi
72 77
 
73 78
     if [ -d $INSTALL_DIR/librevault/build ]; then
74
-        if ! grep -q "Librevault commit:$LIBREVAULT_COMMIT" $COMPLETION_FILE; then
75
-            set_repo_commit $INSTALL_DIR/librevault "Librevault commit" "$LIBREVAULT_COMMIT" $LIBREVAULT_REPO
79
+        if ! grep -q "librevault commit:$LIBREVAULT_COMMIT" $COMPLETION_FILE; then
80
+            set_repo_commit $INSTALL_DIR/librevault "librevault commit" "$LIBREVAULT_COMMIT" $LIBREVAULT_REPO
76 81
             cd $INSTALL_DIR/librevault
77 82
             git submodule update --init --recursive
78 83
             cd $INSTALL_DIR/librevault/build
@@ -262,7 +267,7 @@ function install_librevault {
262 267
     cmake --build .
263 268
     make install
264 269
 
265
-    set_completion_param "Librevault commit" "$LIBREVAULT_COMMIT"
270
+    set_completion_param "librevault commit" "$LIBREVAULT_COMMIT"
266 271
 
267 272
     LIBREVAULT_DAEMON=/etc/systemd/system/librevault-daemon.service
268 273
     echo '[Unit]' > $LIBREVAULT_DAEMON

+ 5
- 0
src/freedombone-app-lychee 查看文件

@@ -123,6 +123,11 @@ function reconfigure_lychee {
123 123
 }
124 124
 
125 125
 function upgrade_lychee {
126
+    CURR_LYCHEE_COMMIT=$(get_completion_param "lychee commit")
127
+    if [[ "$CURR_LYCHEE_COMMIT" == "$LYCHEE_COMMIT" ]]; then
128
+        return
129
+    fi
130
+
126 131
     read_config_param "LYCHEE_DOMAIN_NAME"
127 132
 
128 133
     function_check set_repo_commit

+ 5
- 8
src/freedombone-app-mailpile 查看文件

@@ -83,24 +83,21 @@ function reconfigure_mailpile {
83 83
 function upgrade_mailpile {
84 84
     read_config_param "MAILPILE_DOMAIN_NAME"
85 85
 
86
-    upgrade_mp=
87 86
     CURR_COMMIT=$MAILPILE_COMMIT
88 87
     if grep -q "mailpile commit" $COMPLETION_FILE; then
89 88
         CURR_COMMIT=$(get_completion_param "mailpile commit")
90 89
     fi
91
-    if [[ "$CURR_COMMIT" != "$MAILPILE_COMMIT" ]]; then
92
-        upgrade_mp=1
90
+    if [[ "$CURR_COMMIT" == "$MAILPILE_COMMIT" ]]; then
91
+        return
93 92
     fi
94 93
 
95 94
     function_check set_repo_commit
96 95
     set_repo_commit /var/www/$MAILPILE_DOMAIN_NAME/mail "mailpile commit" "$MAILPILE_COMMIT" $MAILPILE_REPO
97 96
 
98
-    if [ $upgrade_mp ]; then
99
-        cd /var/www/$MAILPILE_DOMAIN_NAME/mail
100
-        pip install -r requirements.txt
97
+    cd /var/www/$MAILPILE_DOMAIN_NAME/mail
98
+    pip install -r requirements.txt
101 99
 
102
-        chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail
103
-    fi
100
+    chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail
104 101
 }
105 102
 
106 103
 function backup_local_mailpile {

+ 6
- 0
src/freedombone-app-matrix 查看文件

@@ -329,6 +329,12 @@ function upgrade_matrix {
329 329
     if [ ! -d /etc/matrix ]; then
330 330
        return
331 331
     fi
332
+
333
+    CURR_MATRIX_COMMIT=$(get_completion_param "matrix commit")
334
+    if [[ "$CURR_MATRIX_COMMIT" == "$MATRIX_COMMIT" ]]; then
335
+        return
336
+    fi
337
+
332 338
     systemctl stop turn
333 339
     systemctl stop matrix
334 340
 

+ 5
- 0
src/freedombone-app-movim 查看文件

@@ -152,6 +152,11 @@ function reconfigure_movim {
152 152
 }
153 153
 
154 154
 function upgrade_movim {
155
+    CURR_MOVIM_COMMIT=$(get_completion_param "movim commit")
156
+    if [[ "$CURR_MOVIM_COMMIT" == "$MOVIM_COMMIT" ]]; then
157
+        return
158
+    fi
159
+
155 160
     if grep -q "movim domain" $COMPLETION_FILE; then
156 161
         MOVIM_DOMAIN_NAME=$(get_completion_param "movim domain")
157 162
     fi

+ 12
- 0
src/freedombone-app-nextcloud 查看文件

@@ -178,6 +178,18 @@ function configure_interactive_nextcloud {
178 178
 }
179 179
 
180 180
 function upgrade_nextcloud {
181
+    CURR_NEXTCLOUD_COMMIT=$(get_completion_param "nextcloud commit")
182
+    if [[ "$CURR_NEXTCLOUD_COMMIT" == "$NEXTCLOUD_COMMIT" ]]; then
183
+        chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
184
+        chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/data
185
+        cd /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
186
+        sudo -u www-data ./occ maintenance:repair
187
+        sudo -u www-data ./occ files:cleanup
188
+        sudo -u www-data ./occ files:scan --all
189
+        sudo -u www-data ./occ maintenance:mode --off
190
+        return
191
+    fi
192
+
181 193
     if grep -q "nextcloud domain" $COMPLETION_FILE; then
182 194
         NEXTCLOUD_DOMAIN_NAME=$(get_completion_param "nextcloud domain")
183 195
     fi

+ 5
- 0
src/freedombone-app-pihole 查看文件

@@ -278,6 +278,11 @@ function reconfigure_pihole {
278 278
 }
279 279
 
280 280
 function upgrade_pihole {
281
+    CURR_PIHOLE_COMMIT=$(get_completion_param "pihole commit")
282
+    if [[ "$CURR_PIHOLE_COMMIT" == "$PIHOLE_COMMIT" ]]; then
283
+        return
284
+    fi
285
+
281 286
     function_check set_repo_commit
282 287
     set_repo_commit $INSTALL_DIR/pihole "pihole commit" "$PIHOLE_COMMIT" $PIHOLE_REPO
283 288
 

+ 5
- 0
src/freedombone-app-rss 查看文件

@@ -96,6 +96,11 @@ function reconfigure_rss {
96 96
 }
97 97
 
98 98
 function upgrade_rss {
99
+    CURR_RSS_READER_COMMIT=$(get_completion_param "rss reader commit")
100
+    if [[ "$CURR_RSS_READER_COMMIT" == "$RSS_READER_COMMIT" ]]; then
101
+        return
102
+    fi
103
+
99 104
     RSS_MOBILE_READER_PATH=/etc/share/ttrss-mobile
100 105
 
101 106
     if [[ $(app_is_installed rss) == "1" ]]; then

+ 5
- 0
src/freedombone-app-searx 查看文件

@@ -737,6 +737,11 @@ function create_searx_config {
737 737
 }
738 738
 
739 739
 function upgrade_searx {
740
+    CURR_SEARX_COMMIT=$(get_completion_param "searx commit")
741
+    if [[ "$CURR_SEARX_COMMIT" == "$SEARX_COMMIT" ]]; then
742
+        return
743
+    fi
744
+
740 745
     settings_file=${SEARX_PATH}/searx/searx/settings.yml
741 746
     background_image=/etc/searx/searx/static/themes/courgette/img/bg-body-index.jpg
742 747
 

+ 5
- 0
src/freedombone-app-turtl 查看文件

@@ -186,6 +186,11 @@ function reconfigure_turtl {
186 186
 }
187 187
 
188 188
 function upgrade_turtl {
189
+    CURR_TURTL_COMMIT=$(get_completion_param "turtl commit")
190
+    if [[ "$CURR_TURTL_COMMIT" == "$TURTL_COMMIT" ]]; then
191
+        return
192
+    fi
193
+
189 194
     read_config_param "TURTL_DOMAIN_NAME"
190 195
 
191 196
     function_check set_repo_commit