Bob Mottram 8 лет назад
Родитель
Сommit
5096ba9cc1
1 измененных файлов: 12 добавлений и 14 удалений
  1. 12
    14
      src/freedombone-app-nextcloud

+ 12
- 14
src/freedombone-app-nextcloud Просмотреть файл

@@ -183,16 +183,20 @@ function configure_interactive_nextcloud {
183 183
     echo -n ''
184 184
 }
185 185
 
186
+function upgrade_nextcloud_base {
187
+    chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
188
+    chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/data
189
+    cd /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
190
+    sudo -u www-data ./occ maintenance:repair
191
+    sudo -u www-data ./occ files:cleanup
192
+    sudo -u www-data ./occ files:scan --all
193
+    sudo -u www-data ./occ maintenance:mode --off
194
+}
195
+
186 196
 function upgrade_nextcloud {
187 197
     CURR_NEXTCLOUD_COMMIT=$(get_completion_param "nextcloud commit")
188 198
     if [[ "$CURR_NEXTCLOUD_COMMIT" == "$NEXTCLOUD_COMMIT" ]]; then
189
-        chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
190
-        chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/data
191
-        cd /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
192
-        sudo -u www-data ./occ maintenance:repair
193
-        sudo -u www-data ./occ files:cleanup
194
-        sudo -u www-data ./occ files:scan --all
195
-        sudo -u www-data ./occ maintenance:mode --off
199
+        upgrade_nextcloud_base
196 200
         return
197 201
     fi
198 202
 
@@ -204,13 +208,7 @@ function upgrade_nextcloud {
204 208
     function_check set_repo_commit
205 209
     set_repo_commit /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs "nextcloud commit" "$NEXTCLOUD_COMMIT" $NEXTCLOUD_REPO
206 210
 
207
-    chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
208
-    chown -R www-data:www-data /var/www/$NEXTCLOUD_DOMAIN_NAME/data
209
-    cd /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs
210
-    sudo -u www-data ./occ maintenance:repair
211
-    sudo -u www-data ./occ files:cleanup
212
-    sudo -u www-data ./occ files:scan --all
213
-    sudo -u www-data ./occ maintenance:mode --off
211
+    upgrade_nextcloud_base
214 212
 }
215 213
 
216 214