Improve Pleroma migration scripts.

[config] / buster / setup_scripts / migrate_pleroma.sh

diff --git a/buster/setup_scripts/migrate_pleroma.sh b/buster/setup_scripts/migrate_pleroma.sh
index 5eefc39f561c05941592c07c13a6252601a026cb..80da33dfcd2b36cbe38e35a052d892b45afd1768 100755 (executable)
--- a/buster/setup_scripts/migrate_pleroma.sh
+++ b/buster/setup_scripts/migrate_pleroma.sh
@@ -12,14 +12,10 @@ server_ip="$1"
 config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 
-# So we're only asked once …
-eval $(ssh-agent)
-ssh-add
-
 cd "${setup_scripts_dir}"
 ./prepare_to_meet_server.sh "${server_ip}"
+eval $(ssh-agent) && ssh-add
 read -p'Hit Enter when you are done.' ignore
-ssh plom@"${server_ip}" 'su -lc "cd config && git pull"'
-ssh plom@"${server_ip}" 'su -lc "cd config/buster/setup_scripts && ./backup_pleroma.sh"'
+ssh plom@"${server_ip}" 'su -lc "cd config && git pull && cd config/buster/setup_scripts && ./backup_pleroma.sh"'
 scp plom@"${server_ip}":~/pleroma_backup.tar /home/plom/pleroma_backup.tar
 ./restore_pleroma.sh