diff --git a/arkdep b/arkdep index 6e7358d..1f9e89f 100755 --- a/arkdep +++ b/arkdep @@ -55,7 +55,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 ${migrate_files+x} ]] && migrate_files=('var/usrlocal' 'var/usrliblocale' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') && printf '\e[1;33m\e[0m\e[1m migrate_files not defined in config, using default\e[0m\n' + [[ -z ${migrate_files+x} ]] && migrate_files=('var/usrlocal' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') && 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' @@ -371,7 +371,7 @@ init () { latest_image_always_default=0 # List of files and folders to be recursively copied over from root tree to new root filesystem - migrate_files=('var/usrlocal' 'var/usrliblocale' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') + migrate_files=('var/usrlocal' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') # Load script extensions from /arkdep/extensions load_extensions=0 diff --git a/arkdep-build b/arkdep-build index 5032b27..a09ac00 100755 --- a/arkdep-build +++ b/arkdep-build @@ -278,10 +278,6 @@ if [[ $type == 'archlinux' ]]; then mv $workdir/usr/local $workdir/var/usrlocal || cleanup_and_quit 'Failed to move usr/local to var/usrlocal' ln -sv ../var/usrlocal $workdir/usr/local || cleanup_and_quit 'Failed to create usrlocal symlink' - # locale symlink - mv $workdir/usr/lib/locale $workdir/var/usrliblocale || cleanup_and_quit 'Failed to move usr/local to var/usrlocal' - ln -sv ../../../var/usrliblocale $workdir/usr/lib/locale || cleanup_and_quit 'Failed to create usrlocal symlink' - # Opt symlink mv $workdir/opt $workdir/var/ || cleanup_and_quit 'Failed to move opt to var/opt' ln -sv var/opt $workdir/opt || cleanup_and_quit 'Failed to create opt symlink' diff --git a/arkdep-build.d/arkanelinux/package.list b/arkdep-build.d/arkanelinux/package.list index 6133d96..f95bdff 100644 --- a/arkdep-build.d/arkanelinux/package.list +++ b/arkdep-build.d/arkanelinux/package.list @@ -25,6 +25,7 @@ fuse fwupd gdm git +glibc-locales gnome-backgrounds gnome-console gnome-control-center diff --git a/arkdep-build.d/test-arkanelinux-kde/package.list b/arkdep-build.d/test-arkanelinux-kde/package.list index db9509d..02be7d4 100644 --- a/arkdep-build.d/test-arkanelinux-kde/package.list +++ b/arkdep-build.d/test-arkanelinux-kde/package.list @@ -26,10 +26,10 @@ efibootmgr evince f2fs-tools fakeroot -firefox flatpak fuse git +glibc-locales gst-plugin-pipewire gst-plugins-base gst-plugins-good diff --git a/arkdep-build.d/test-arkanelinux-pantheon/package.list b/arkdep-build.d/test-arkanelinux-pantheon/package.list index 1981f24..1cdcce9 100644 --- a/arkdep-build.d/test-arkanelinux-pantheon/package.list +++ b/arkdep-build.d/test-arkanelinux-pantheon/package.list @@ -29,6 +29,7 @@ flatpak fuse gala git +glibc-locales gnome-keyring gnome-session gnome-settings-daemon diff --git a/arkdep-build.d/test-manjaro-kde/package.list b/arkdep-build.d/test-manjaro-kde/package.list index b80379c..c89534e 100644 --- a/arkdep-build.d/test-manjaro-kde/package.list +++ b/arkdep-build.d/test-manjaro-kde/package.list @@ -1,5 +1,4 @@ alsa-firmware -fuse alsa-utils arkdep audiocd-kio @@ -14,6 +13,8 @@ dolphin-plugins ffmpeg ffmpegthumbs flatpak +fuse +glibc-locales gnome-themes-standard gst-libav gst-plugins-bad