diff --git a/arkdep b/arkdep index cdcd212..232f14e 100755 --- a/arkdep +++ b/arkdep @@ -47,7 +47,7 @@ if [[ ! $1 == 'init' ]]; then [[ -z ${update_cpu_microcode+x} ]] && update_cpu_microcode=1 && printf '\e[1;33m\e[0m\e[1m update_cpu_microcode not defined in config, using default\e[0m\n' [[ -z ${backup_user_accounts+x} ]] && backup_user_accounts=1 && printf '\e[1;33m\e[0m\e[1m backup_user_accounts not defined in config, using default\e[0m\n' [[ -z ${latest_image_always_default+x} ]] && latest_image_always_default=0 && printf '\e[1;33m\e[0m\e[1m latest_image_always_default not defined in config, using default\e[0m\n' - [[ -z ${var_migrate_files+x} ]] && var_migrate_files=('/usrlocal' '/usrliblocale' '/opt' '/srv' '/nm-system-connections' '/lib/AccountsService' '/lib/bluetooth' '/lib/NetworkManager' '/lib/arkane') && printf '\e[1;33m\e[0m\e[1m var_migrate_files not defined in config, using default\e[0m\n' + [[ -z ${migrate_files+x} ]] && migrate_files=('/var/usrlocal' '/var/usrliblocale' '/var/opt' '/var/srv' '/var/nm-system-connections' '/var/lib/AccountsService' '/var/lib/bluetooth' '/var/lib/NetworkManager' '/var/lib/arkane' '/etc/localtime' '/etc/locale.gen' '/etc/locale.conf') && printf '\e[1;33m\e[0m\e[1m migrate_files not defined in config, using default\e[0m\n' [[ -z ${load_extensions+x} ]] && load_extensions=0 && printf '\e[1;33m\e[0m\e[1m load_extensions not defined in config, using default\e[0m\n' [[ -z ${remove_tar_after_deployment+x} ]] && remove_tar_after_deployment=1 && printf '\e[1;33m\e[0m\e[1m remove_tar_after_deployment not defined in config, using default\e[0m\n' [[ -z ${update_diff_style+x} ]] && update_diff_style='list' && printf '\e[1;33m\e[0m\e[1m update_diff_style not defined in config, using default\e[0m\n' @@ -348,7 +348,7 @@ init () { latest_image_always_default=0 # List of files and folders to be recursively copied over from var to new var, path should start with / - var_migrate_files=('/usrlocal' '/usrliblocale' '/opt' '/srv' '/nm-system-connections' '/lib/AccountsService' '/lib/bluetooth' '/lib/NetworkManager' '/lib/arkane') + migrate_files=('/var/usrlocal' '/var/usrliblocale' '/var/opt' '/var/srv' '/var/nm-system-connections' '/var/lib/AccountsService' '/var/lib/bluetooth' '/var/lib/NetworkManager' '/var/lib/arkane' '/etc/localtime' '/etc/locale.gen' '/etc/locale.conf') # Load script extensions from /arkdep/extensions load_extensions=0 @@ -1013,11 +1013,11 @@ deploy () { fi # Migrate specified files and directories - if [[ ${#var_migrate_files[@]} -ge 1 ]] && [[ ! -n $ARKDEP_ROOT ]]; then + if [[ ${#migrate_files[@]} -ge 1 ]] && [[ ! -n $ARKDEP_ROOT ]]; then printf '\e[1;34m-->\e[0m\e[1m Migrating local files to new deployment\e[0m\n' - for file in ${var_migrate_files[@]}; do - printf "Copying /var$file\n" - cp -r /var/$file $arkdep_dir/deployments/${data[0]}/rootfs/var/${file%/*} + for file in ${migrate_files[@]}; do + printf "Copying $file\n" + cp -r /$file $arkdep_dir/deployments/${data[0]}/rootfs/${file%/*} done fi