Pārlūkot izejas kodu

Remove movim on xmpp uninstall

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
edd0e53d89
2 mainītis faili ar 9 papildinājumiem un 3 dzēšanām
  1. 8
    3
      src/freedombone-app-movim
  2. 1
    0
      src/freedombone-app-xmpp

+ 8
- 3
src/freedombone-app-movim Parādīt failu

28
 # You should have received a copy of the GNU Affero General Public License
28
 # You should have received a copy of the GNU Affero General Public License
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
 
30
 
31
-VARIANTS='full full-vim chat'
31
+VARIANTS='full full-vim social'
32
 
32
 
33
 IN_DEFAULT_INSTALL=0
33
 IN_DEFAULT_INSTALL=0
34
 SHOW_ON_ABOUT=1
34
 SHOW_ON_ABOUT=1
225
             function_check backup_database_to_friend
225
             function_check backup_database_to_friend
226
             backup_database_to_friend movim
226
             backup_database_to_friend movim
227
 
227
 
228
-            echo $"Backing up GNU social installation"
229
-
230
             function_check backup_directory_to_friend
228
             function_check backup_directory_to_friend
231
             backup_directory_to_friend $temp_backup_dir movim
229
             backup_directory_to_friend $temp_backup_dir movim
232
 
230
 
260
 }
258
 }
261
 
259
 
262
 function remove_movim {
260
 function remove_movim {
261
+    if [[ $(app_is_installed movim) == "0" ]]; then
262
+        return
263
+    fi
263
     read_config_param "MOVIM_DOMAIN_NAME"
264
     read_config_param "MOVIM_DOMAIN_NAME"
264
     if [ ${#MOVIM_DOMAIN_NAME} -eq 0 ]; then
265
     if [ ${#MOVIM_DOMAIN_NAME} -eq 0 ]; then
265
         return
266
         return
298
         exit 72572
299
         exit 72572
299
     fi
300
     fi
300
 
301
 
302
+    if [[ $(app_is_installed xmpp) == "0" ]]; then
303
+        return
304
+    fi
305
+
301
     movim_hourly_script movim $MOVIM_DOMAIN_NAME
306
     movim_hourly_script movim $MOVIM_DOMAIN_NAME
302
 
307
 
303
     function_check install_mariadb
308
     function_check install_mariadb

+ 1
- 0
src/freedombone-app-xmpp Parādīt failu

498
 
498
 
499
 function remove_xmpp {
499
 function remove_xmpp {
500
     remove_profanity
500
     remove_profanity
501
+    remove_movim
501
     firewall_remove 5222 tcp
502
     firewall_remove 5222 tcp
502
     firewall_remove 5223 tcp
503
     firewall_remove 5223 tcp
503
     firewall_remove 5269 tcp
504
     firewall_remove 5269 tcp