Compare commits

..

No commits in common. "84321084a10c2c8f7f4cc831201edc682b12f274" and "d7787bedcf30d109f8897906e8b74f84b53c42ea" have entirely different histories.

View File

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