improve rsync-push

1 files changed, 23 insertions, 27 deletions

diff --git a/wordpress/wordpress-rsync-push-site b/wordpress/wordpress-rsync-push-site
index 225a6c4..69a32c5 100755
--- a/wordpress/wordpress-rsync-push-site
+++ b/wordpress/wordpress-rsync-push-site
@@ -28,21 +28,21 @@ conf_file=/./etc/apache2/sites-available/$site.conf
 
 installer()
 {
-        echo mysqlrestore "$1"
+        printf 'arg1=%s\n' "$1"
+        printf 'arg2=%s\n' "$2"
 }
 
 installer_source_code()
 {
         echo '#!/bin/sh'
         declare -f installer
-        echo "installer \"$1\""
+        printf 'installer %q %q\n' "$1" "$2"
 }
 
 do_rsync()
-{ (
-        set -x
-        rsync ${NO_ACT:+ -nv} -u -aRi --delete --partial "$conf_file" "$html_dir" "$remote_host":/"$target_dir"
-) }
+{
+        rsync ${NO_ACT:+ -n} -u -aR --delete --partial "$conf_file" "$html_dir" "$remote_host":"$target_dir"/
+}
 
 remote_mysqldump()
 {
@@ -55,28 +55,24 @@ remote_mysqldump()
 }
 
 do_mysqldump()
-{ (
-        case "$NO_ACT" in
-                '') of=/srv/$site/wordpress-database~"$(date -Ins)".sql.gz ;;
-                * ) of=/dev/null ;;
-        esac
-        oftest=/srv/$site/wordpress-database~"$(date -Ins)".sql.gz
-        printf '%s\n' "$oftest" >&2
-        installer_source_code "$oftest" >&2
-
-        if [ "$use_rsync" ]
-        then
-                set -x
-                dumpfile=$(mktemp -p "$XDG_RUNTIME_DIR") || dumpfile=$(mktemp)
-                remote_mysqldump | gzip -c > "$dumpfile"
-                rsync --ignore-existing "$dumpfile" "$remote_host":"$of"
-                rm "$dumpfile"
-        else
-                set -x
-                remote_mysqldump | gzip -c | ssh "$remote_host" dd conv=notrunc "of=$of"
-        fi
-) }
+{
+        of=$target_dir/srv/$site/wordpress-database~"$(date -Ins)".sql.gz
+
+        dumpfile=$(mktemp -p "$XDG_RUNTIME_DIR") || dumpfile=$(mktemp)
+        remote_mysqldump | gzip -c > "$dumpfile"
+        rsync ${NO_ACT:+ -n} --ignore-existing "$dumpfile" "$remote_host":"$of"
+        rm "$dumpfile"
+}
+
+do_installer()
+{
+        installer_exe=$(mktemp -p "$XDG_RUNTIME_DIR") || installer_exe=$(mktemp)
+        installer_source_code "$target_dir" "$of" > "$installer_exe"
+}
 
+target_dir=/var/tmp/wordpress-rsync-push-site~$(date -Ins) NO_ACT=
+[ "$target_dir" ] || NO_ACT=y
 use_rsync=y
 do_rsync
 do_mysqldump
+do_installer