diff --git a/system/arch/PKGBUILD b/system/arch/PKGBUILD index ebe243e..b236ba2 100644 --- a/system/arch/PKGBUILD +++ b/system/arch/PKGBUILD @@ -10,19 +10,20 @@ backup=() package() { cd "$(dirname "${BASH_SOURCE[0]}")/../files" - install -Dm644 ../../LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" - _install_files * + + install -vDm644 ../../LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" + _install_my_file -vDm644 etc/initcpio/hooks/bootmsg + _install_my_file -vDm644 etc/initcpio/install/bootmsg + _install_my_file -vDm644 etc/initcpio/hooks/consolecolors + _install_my_file -vDm644 etc/initcpio/install/consolecolors + install -vdm750 "$pkgdir/etc/sudoers.d" + _install_my_file -vDm640 etc/sudoers.d/99_dmitmel_dotfiles + _install_my_file -vDm644 etc/sysctl.d/50-dmitmel.conf + _install_my_file -vDm644 etc/bootmsg + install -vDm644 ../../colorschemes/out/setvtrgb.txt "$pkgdir/etc/consolecolors" + _install_my_file -vDm644 etc/locale.conf } -_install_files() { - local path real_path mode; for path in "$@"; do - real_path="$(realpath "$path")" - mode="$(stat --format "%a" "$real_path")" - if [[ -d "$path" ]]; then - install --directory --mode "$mode" "$pkgdir/$path" - _install_files "$path"/* - else - install --mode "$mode" "$real_path" "$pkgdir/$path" - fi - done +_install_my_file() { + install "$@" "$pkgdir/${*: -1}" } diff --git a/system/files/etc/consolecolors b/system/files/etc/consolecolors deleted file mode 120000 index 88086d3..0000000 --- a/system/files/etc/consolecolors +++ /dev/null @@ -1 +0,0 @@ -../../../colorschemes/out/setvtrgb.txt \ No newline at end of file diff --git a/system/install.sh b/system/install.sh index 90042e4..3483d3e 100755 --- a/system/install.sh +++ b/system/install.sh @@ -6,7 +6,7 @@ distro="$(lsb_release -si)" case "$distro" in Arch) cd arch - makepkg --syncdeps --force --install + makepkg --syncdeps --force --install --clean ;; *) echo >&2 "distro '$distro' is unsupported"