浏览代码

Separate remote backips file with spaces

Bob Mottram 9 年前
父节点
当前提交
46e0aba9b3
共有 3 个文件被更改,包括 11 次插入7 次删除
  1. 5
    3
      src/freedombone-backup-remote
  2. 3
    3
      src/freedombone-remote
  3. 3
    1
      src/freedombone-restore-remote

+ 5
- 3
src/freedombone-backup-remote 查看文件

533
 do
533
 do
534
     # Get the server and its password
534
     # Get the server and its password
535
     # Format is:
535
     # Format is:
536
-    #   username@domain:/home/username <port number> <ssh password>
536
+    #   username@domain <port number> /home/username <ssh password>
537
     REMOTE_SERVER=$(echo "${remote_server}" | awk -F ' ' '{print $1}')
537
     REMOTE_SERVER=$(echo "${remote_server}" | awk -F ' ' '{print $1}')
538
     if [ $REMOTE_SERVER ]; then
538
     if [ $REMOTE_SERVER ]; then
539
-        REMOTE_DOMAIN=$(echo "${remote_server}" | awk -F ':' '{print $1}' | awk -F '@' '{print $2}')
539
+        REMOTE_DOMAIN=$(echo "${remote_server}" | awk -F ' ' '{print $1}' | awk -F '@' '{print $2}')
540
         REMOTE_SSH_PORT=$(echo "${remote_server}" | awk -F ' ' '{print $2}')
540
         REMOTE_SSH_PORT=$(echo "${remote_server}" | awk -F ' ' '{print $2}')
541
-        REMOTE_PASSWORD=$(echo "${remote_server}" | awk -F ' ' '{print $3}')
541
+		REMOTE_DIRECTORY=$(echo "${remote_server}" | awk -F ' ' '{print $3}')
542
+        REMOTE_PASSWORD=$(echo "${remote_server}" | awk -F ' ' '{print $4}')
542
         NOW=$(date +"%Y-%m-%d %H:%M:%S")
543
         NOW=$(date +"%Y-%m-%d %H:%M:%S")
544
+        REMOTE_SERVER=$REMOTE_SERVER:$REMOTE_DIRECTORY
543
 
545
 
544
         echo "$NOW Starting backup to $REMOTE_SERVER" >> /var/log/remotebackups.log
546
         echo "$NOW Starting backup to $REMOTE_SERVER" >> /var/log/remotebackups.log
545
 
547
 

+ 3
- 3
src/freedombone-remote 查看文件

196
                           dialog --title "Password quality check" --msgbox "The reciprocal password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters" 6 40
196
                           dialog --title "Password quality check" --msgbox "The reciprocal password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters" 6 40
197
                       else
197
                       else
198
                           echo ${remote_ssh_reciprocal_username}:${remote_ssh_reciprocal_password}::::/home/${remote_ssh_reciprocal_username}:bash | newusers
198
                           echo ${remote_ssh_reciprocal_username}:${remote_ssh_reciprocal_password}::::/home/${remote_ssh_reciprocal_username}:bash | newusers
199
-                          echo "$remote_ssh_username@$remote_ssh_domain:$remote_ssh_port//home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
199
+                          echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
200
                           remote_ssh_username=""
200
                           remote_ssh_username=""
201
                           remote_ssh_domain=""
201
                           remote_ssh_domain=""
202
                           remote_ssh_port=""
202
                           remote_ssh_port=""
206
                           entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
206
                           entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
207
                       fi
207
                       fi
208
                   else
208
                   else
209
-                      echo "$remote_ssh_username@$remote_ssh_domain:$remote_ssh_port//home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
209
+                      echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
210
                       remote_ssh_username=""
210
                       remote_ssh_username=""
211
                       remote_ssh_domain=""
211
                       remote_ssh_domain=""
212
                       remote_ssh_port=""
212
                       remote_ssh_port=""
216
                       entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
216
                       entering_remote_backups_ctr=$((entering_remote_backups_ctr + 1))
217
                   fi
217
                   fi
218
               else
218
               else
219
-                  echo "$remote_ssh_username@$remote_ssh_domain:$remote_ssh_port//home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
219
+                  echo "$remote_ssh_username@$remote_ssh_domain $remote_ssh_port /home/$remote_ssh_username $remote_ssh_password" >> $FRIENDS_SERVERS_LIST
220
                   remote_ssh_username=""
220
                   remote_ssh_username=""
221
                   remote_ssh_domain=""
221
                   remote_ssh_domain=""
222
                   remote_ssh_port=""
222
                   remote_ssh_port=""

+ 3
- 1
src/freedombone-restore-remote 查看文件

70
 
70
 
71
 REMOTE_SERVER=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $1}')
71
 REMOTE_SERVER=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $1}')
72
 REMOTE_SSH_PORT=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $2}')
72
 REMOTE_SSH_PORT=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $2}')
73
-REMOTE_PASSWORD=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $3}')
73
+REMOTE_DIRECTORY=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $3}')
74
+REMOTE_PASSWORD=$(grep -i "$SERVER_NAME" $BACKUP_LIST | awk -F ' ' '{print $4}')
75
+REMOTE_SERVER=$REMOTE_SERVER:$REMOTE_DIRECTORY
74
 
76
 
75
 NOW=$(date +"%Y-%m-%d %H:%M:%S")
77
 NOW=$(date +"%Y-%m-%d %H:%M:%S")
76
 
78