瀏覽代碼

Move local mumble restore to app script

Bob Mottram 8 年之前
父節點
當前提交
bda2f9919d
共有 2 個檔案被更改,包括 37 行新增34 行删除
  1. 37
    1
      src/freedombone-app-mumble
  2. 0
    33
      src/freedombone-restore-local

+ 37
- 1
src/freedombone-app-mumble 查看文件

@@ -57,8 +57,44 @@ function backup_local_mumble {
57 57
 	fi
58 58
 }
59 59
 
60
+function restore_local_mumble {
61
+	if [ -d $USB_MOUNT/backup/voip ]; then
62
+		echo $"Restoring VoIP settings"
63
+		temp_restore_dir=/root/tempvoip
64
+		function_check restore_directory_from_usb
65
+		restore_directory_from_usb $temp_restore_dir voip
66
+		cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/
67
+		if [ ! "$?" = "0" ]; then
68
+			rm -rf $temp_restore_dir
69
+			function_check set_user_permissions
70
+			set_user_permissions
71
+			function_check backup_unmount_drive
72
+			backup_unmount_drive
73
+			exit 3679
74
+		fi
75
+		cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/
76
+		if [ ! "$?" = "0" ]; then
77
+			rm -rf $temp_restore_dir
78
+			function_check set_user_permissions
79
+			set_user_permissions
80
+			function_check backup_unmount_drive
81
+			backup_unmount_drive
82
+			exit 276
83
+		fi
84
+		rm -rf $temp_restore_dir
85
+		cp /etc/ssl/certs/mumble* /var/lib/mumble-server
86
+		cp /etc/ssl/private/mumble* /var/lib/mumble-server
87
+		chown -R mumble-server:mumble-server /var/lib/mumble-server
88
+		service mumble-server restart
89
+	fi
90
+}
91
+
60 92
 function backup_remote_mumble {
61
-	echo ''
93
+	echo -n ''
94
+}
95
+
96
+function restore_remote_mumble {
97
+	echo -n ''
62 98
 }
63 99
 
64 100
 function remove_mumble {

+ 0
- 33
src/freedombone-restore-local 查看文件

@@ -1185,38 +1185,6 @@ function restore_dlna {
1185 1185
     fi
1186 1186
 }
1187 1187
 
1188
-function restore_voip {
1189
-    if [[ $RESTORE_APP != 'all' ]]; then
1190
-        if [[ $RESTORE_APP != 'voip' ]]; then
1191
-            return
1192
-        fi
1193
-    fi
1194
-    if [ -d $USB_MOUNT/backup/voip ]; then
1195
-        echo $"Restoring VoIP settings"
1196
-        temp_restore_dir=/root/tempvoip
1197
-        restore_directory_from_usb $temp_restore_dir voip
1198
-        cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.ini /etc/
1199
-        if [ ! "$?" = "0" ]; then
1200
-            rm -rf $temp_restore_dir
1201
-            set_user_permissions
1202
-            backup_unmount_drive
1203
-            exit 3679
1204
-        fi
1205
-        cp -f $temp_restore_dir/home/$ADMIN_USERNAME/tempbackup/mumble-server.sqlite /var/lib/mumble-server/
1206
-        if [ ! "$?" = "0" ]; then
1207
-            rm -rf $temp_restore_dir
1208
-            set_user_permissions
1209
-            backup_unmount_drive
1210
-            exit 276
1211
-        fi
1212
-        rm -rf $temp_restore_dir
1213
-        cp /etc/ssl/certs/mumble* /var/lib/mumble-server
1214
-        cp /etc/ssl/private/mumble* /var/lib/mumble-server
1215
-        chown -R mumble-server:mumble-server /var/lib/mumble-server
1216
-        service mumble-server restart
1217
-    fi
1218
-}
1219
-
1220 1188
 function get_restore_app {
1221 1189
     if [ ${1} ]; then
1222 1190
         if [ ! -d /home/${1} ]; then
@@ -1287,7 +1255,6 @@ restore_blog
1287 1255
 restore_cjdns
1288 1256
 restore_email
1289 1257
 restore_dlna
1290
-restore_voip
1291 1258
 
1292 1259
 restore_apps
1293 1260
 set_user_permissions