mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
replace find and fix fd locale cleaning
This commit is contained in:
parent
d6befec24f
commit
462cd6a991
3 changed files with 18 additions and 16 deletions
|
@ -67,13 +67,13 @@ _clean_container() {
|
||||||
rm -r "${1}"/usr/share/{aclocal,applications,audit-rules,awk,common-lisp,emacs,et,fish,gettext,gettext-[0-9]*,glib-[0-9]*,gnupg,gtk-doc,iana-etc,icons,icu,keyutils,libalpm,libgpg-error,makepkg-template,misc,pixmaps,pkgconfig,screen,smartmontools,ss,tabset,vala,xml,man,doc,info,xtables}
|
rm -r "${1}"/usr/share/{aclocal,applications,audit-rules,awk,common-lisp,emacs,et,fish,gettext,gettext-[0-9]*,glib-[0-9]*,gnupg,gtk-doc,iana-etc,icons,icu,keyutils,libalpm,libgpg-error,makepkg-template,misc,pixmaps,pkgconfig,screen,smartmontools,ss,tabset,vala,xml,man,doc,info,xtables}
|
||||||
rm -r "${1}"/usr/lib/{audit,awk,binfmt.d,cmake,dracut,e2fsprogs,environment.d,gawk,getconf,gettext,glib-[0-9]*,gnupg,gssproxy,icu,krb5,ldscripts,libnl,pkgconfig,siconv,tar,xfsprogs,xtables}
|
rm -r "${1}"/usr/lib/{audit,awk,binfmt.d,cmake,dracut,e2fsprogs,environment.d,gawk,getconf,gettext,glib-[0-9]*,gnupg,gssproxy,icu,krb5,ldscripts,libnl,pkgconfig,siconv,tar,xfsprogs,xtables}
|
||||||
# locale cleaning
|
# locale cleaning
|
||||||
fd -u --min-depth 2 -E '*/be/*' -E '*/bg/*' \
|
fd -u --min-depth 2 -E '/be/' -E '/bg/' \
|
||||||
-E '*/cs/*' -E '*/da/*' -E '*/de/*' -E '*/en/*' \
|
-E '/cs/' -E '/da/' -E '/de/' -E '/en/' \
|
||||||
-E '*/el/*' -E '*/es/*' -E '*/fi/*' -E '*/fr/*' \
|
-E '/el/' -E '/es/' -E '/fi/' -E '/fr/' \
|
||||||
-E '*/hu/*' -E '*/it/*' -E '*/lt/*' -E '*/lv/*' \
|
-E '/hu/' -E '/it/' -E '/lt/' -E '/lv/' \
|
||||||
-E '*/mk/*' -E '*/nl/*' -E '*/nn/*' -E '*/pl/*' \
|
-E '/mk/' -E '/nl/' -E '/nn/' -E '/pl/' \
|
||||||
-E '*/pt/*' -E '*/ro/*' -E '*/ru/*' -E '*/sk/*' \
|
-E '/pt/' -E '/ro/' -E '/ru/' -E '/sk/' \
|
||||||
-E '*/sr/*' -E '*/sv/*' -E '*/tr/*' -E '*/uk/*' \
|
-E '/sr/' -E '/sv/' -E '/tr/' -E '/uk/' \
|
||||||
. "${1}"/usr/share/locale/ -X rm &>"${_NO_LOG}"
|
. "${1}"/usr/share/locale/ -X rm &>"${_NO_LOG}"
|
||||||
fd -u -t f -E 'UTF-8.gz' . "${1}"/usr/share/i18n/charmaps -X rm &>"${_NO_LOG}"
|
fd -u -t f -E 'UTF-8.gz' . "${1}"/usr/share/i18n/charmaps -X rm &>"${_NO_LOG}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -6,13 +6,15 @@ _cleanup() {
|
||||||
rm -rf /usr/share/{man,help,info,doc,gtk-doc}
|
rm -rf /usr/share/{man,help,info,doc,gtk-doc}
|
||||||
rm -rf /usr/include
|
rm -rf /usr/include
|
||||||
rm -rf /usr/share/icons/breeze-dark
|
rm -rf /usr/share/icons/breeze-dark
|
||||||
find /usr/share/locale/ -mindepth 2 ! -path '*/be/*' ! -path '*/bg/*' ! -path '*/cs/*' \
|
fd -u --min-depth 2 -E '/be/' -E '/bg/' \
|
||||||
! -path '*/da/*' ! -path '*/de/*' ! -path '*/en/*' ! -path '*/el/*' ! -path '*/es/*' \
|
-E '/cs/' -E '/da/' -E '/de/' -E '/en/' \
|
||||||
! -path '*/fi/*' ! -path '*/fr/*' ! -path '*/hu/*' ! -path '*/it/*' ! -path '*/lt/*' \
|
-E '/el/' -E '/es/' -E '/fi/' -E '/fr/' \
|
||||||
! -path '*/lv/*' ! -path '*/mk/*' ! -path '*/nl/*' ! -path '*/nn/*' ! -path '*/pl/*' \
|
-E '/hu/' -E '/it/' -E '/lt/' -E '/lv/' \
|
||||||
! -path '*/pt/*' ! -path '*/ro/*' ! -path '*/ru/*' ! -path '*/sk/*' ! -path '*/sr/*' \
|
-E '/mk/' -E '/nl/' -E '/nn/' -E '/pl/' \
|
||||||
! -path '*/sv/*' ! -path '*/tr/*' ! -path '*/uk/*' -delete &>"${_NO_LOG}"
|
-E '/pt/' -E '/ro/' -E '/ru/' -E '/sk/' \
|
||||||
find /usr/share/i18n/charmaps ! -name 'UTF-8.gz' -delete &>"${_NO_LOG}"
|
-E '/sr/' -E '/sv/' -E '/tr/' -E '/uk/' \
|
||||||
|
. /usr/share/locale/ -X rm &>"${_NO_LOG}"
|
||||||
|
fd -u -t f -E 'UTF-8.gz' . /usr/share/i18n/charmaps -X rm &>"${_NO_LOG}"
|
||||||
# remove packages from cache
|
# remove packages from cache
|
||||||
#shellcheck disable=SC2013
|
#shellcheck disable=SC2013
|
||||||
for i in $(grep -w -E 'reinstalled|installed|upgraded' /var/log/pacman.log | cut -d ' ' -f 4); do
|
for i in $(grep -w -E 'reinstalled|installed|upgraded' /var/log/pacman.log | cut -d ' ' -f 4); do
|
||||||
|
|
|
@ -129,7 +129,7 @@ _create_initramfs() {
|
||||||
# https://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
|
# https://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
|
||||||
# compress image with zstd
|
# compress image with zstd
|
||||||
cd "${_ROOTFS_DIR}" || exit 1
|
cd "${_ROOTFS_DIR}" || exit 1
|
||||||
find . -mindepth 1 -printf '%P\0' |
|
fd . -u --min-depth 1 -0 |
|
||||||
sort -z |
|
sort -z |
|
||||||
LANG=C bsdtar --null -cnf - -T - |
|
LANG=C bsdtar --null -cnf - -T - |
|
||||||
LANG=C bsdtar --null -cf - --format=newc @- |
|
LANG=C bsdtar --null -cf - --format=newc @- |
|
||||||
|
@ -226,7 +226,7 @@ _new_environment() {
|
||||||
_collect_files &
|
_collect_files &
|
||||||
_progress_wait "42" "84" "Collecting rootfs files in ${_W_DIR}..." "3.75"
|
_progress_wait "42" "84" "Collecting rootfs files in ${_W_DIR}..." "3.75"
|
||||||
_progress "85" "Cleanup ${_W_DIR}..."
|
_progress "85" "Cleanup ${_W_DIR}..."
|
||||||
find "${_W_DIR}"/. -mindepth 1 -maxdepth 1 ! -name 'tmp' -exec rm -rf {} \;
|
fd -u -mindepth 1 -maxdepth 1 -E 'tmp' . "${_W_DIR}"/. -X rm -rf
|
||||||
_clean_kernel_cache
|
_clean_kernel_cache
|
||||||
_ram_check
|
_ram_check
|
||||||
# local switch, don't kexec on local image
|
# local switch, don't kexec on local image
|
||||||
|
|
Loading…
Reference in a new issue