nextcloud/migrate.sh

@@ -78,25 +78,29 @@ TO=$2
 if ! [ -z "$DRY_RUN" ] \
 		|| [ -e "$FROM_THEME_DIR" ] ; then
 	# instance id's...
-	FROM_INSTANCEID=${DRY_RUN:-$(lxc-attach $FROM -- turnkey-occ config:system:get instanceid)}
-	FROM_INSTANCEID=${DRY_RUN:+FROM}
-	TO_INSTANCEID=${DRY_RUN:-$(lxc-attach $TO -- turnkey-occ config:system:get instanceid)}
-	TO_INSTANCEID=${DRY_RUN:+TO}
-
-	FROM_CACHE_DIR=/var/lib/lxc/$TO/rootfs/var/www/nextcloud-data/appdata_$FROM_INSTANCEID
-	TO_CACHE_DIR=/var/lib/lxc/$TO/rootfs/var/www/nextcloud-data/appdata_$TO_INSTANCEID
+	# XXX not sure how to deal with $DRY_RUN here...
+	if [ -z $DRY_RUN ] ; then
+		FROM_INSTANCEID=$(lxc-attach $FROM -- turnkey-occ config:system:get instanceid)
+		TO_INSTANCEID=$(lxc-attach $TO -- turnkey-occ config:system:get instanceid)
+	else 
+		FROM_INSTANCEID=FROM
+		TO_INSTANCEID=TO
+	fi
 
 	# full...
 	if [ "$MIGRATE_CACHE" == "full" ] ; then
 		# migrate theming and other instance files...
-		[ -e "$TO_CACHE_DIR" ] \
-			&& @ mv -f "$TO_CACHE_DIR" "${TO_CACHE_DIR}.bak"
+		APPDATA=/var/lib/lxc/$TO/rootfs/var/www/nextcloud-data/appdata_$TO_INSTANCEID
+		[ -e "$APPDATA" ] \
+			&& @ mv -f "$APPDATA" "${APPDATA}.bak"
 		@ mv -f \
-			"$FROM_CACHE_DIR" \
-			"$TO_CACHE_DIR"
+			/var/lib/lxc/$TO/rootfs/var/www/nextcloud-data/appdata_$FROM_INSTANCEID \
+			"$APPDATA"
 
 	# list...
 	elif [ "$MIGRATE_CACHE" == "list" ] ; then
+		FROM_CACHE_DIR=/var/lib/lxc/$TO/rootfs/var/www/nextcloud-data/appdata_$FROM_INSTANCEID/
+		TO_CACHE_DIR=/var/lib/lxc/$TO/rootfs/var/www/nextcloud-data/appdata_$TO_INSTANCEID/
 		for f in "${MIGRATE_CACHE_FILES[@]}" ; do
 			from=${FROM_CACHE_DIR}/$f
 			to=${TO_CACHE_DIR}/$f