diff --git a/PKGBUILD b/PKGBUILD index d87d70f73c02f43338a6fed3324ba6e522b2e5d7..71e8b240d59749cfdd617635945e476a5d475bb9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,15 @@ # Maintainer: Sébastien Luttringer pkgname=base-seblu -pkgver=2013.09.06 +pkgver=2013.09.10 pkgrel=1 pkgdesc='Provide depends on minimal seblu hosts packages' arch=('any') url='https://github.com/seblu/arch-packages' license=('GPL2') install=$pkgname.install +source=('git+ssh://seblu@seblu.net:2222/~/git/configs') +md5sums=('SKIP') package() { depends=( @@ -98,11 +100,20 @@ package() { sysvinit tcp_wrappers ) - install -dm755 "$pkgdir"/{usr/bin,etc/sysctl.d} + install -dm755 "$pkgdir"/{usr/bin,etc/sysctl.d,usr/share/$pkgname} # perl-rename shortcut ln -s perl-rename "$pkgdir/usr/bin/prename" # disable default sysctl options provided by systemd ln -s /dev/null "$pkgdir/etc/sysctl.d/50-default.conf" + # install defaults configs files + cd "$srcdir/configs" + _d="$pkgdir/usr/share/$pkgname" + install -Dm644 systemd/{vconsole,locale}.conf "$_d" + install -Dm644 systemd/sysctl.d/seblu.net.conf "$_d" + install -Dm644 pam/{issue,motd} "$_d" + install -Dm644 zsh/etc.zshrc "$_d" + install -Dm644 e2fsprogs/e2fsk.conf "$_d" + install -Dm644 ntp/ntp.conf "$_d" } # vim:set ts=2 sw=2 et: diff --git a/base-seblu.install b/base-seblu.install index df6ae84f5de69f7639ac2ceafa216d28344d784e..a486a2e328e17f706d3d8cdf3bcd76093095d450 100644 --- a/base-seblu.install +++ b/base-seblu.install @@ -1,11 +1,11 @@ # vim:set ts=2 sw=2 et: -# $1: the string to be -# $2: the file to update +# $1: the file to update check_file() { - if [[ ! -e "$2" ]] || ! diff "$2" <(printf "%s" "$1") >/dev/null; then - printf "%s" "$1" > "$2" - echo "** file $2 updated" + local p="/usr/share/base-seblu/${1##*/}" + [[ -n "$2" ]] && p="/usr/share/base-seblu/$2" + if [[ ! -e "$1" ]] || ! diff "$1" "$p" >/dev/null; then + cp -f -v "$p" "$1" fi } @@ -20,22 +20,18 @@ check_link() { # arg 1: the new package version post_install() { - # motd - check_file "" /etc/motd - - # issue - rm -f /etc/issue.net - check_file "\n (\s \r) on \l"$'\n' /etc/issue - - # vconsole - check_file 'KEYMAP=fr'$'\n' /etc/vconsole.conf + check_file /etc/motd + check_file /etc/issue + check_file /etc/vconsole.conf + check_file /etc/locale.conf + check_file /etc/ntp.conf + check_file /etc/e2fsk.conf + check_file /etc/sysctl.d/seblu.net.conf + check_file /etc/zsh/zshrc etc.zshrc # localtime check_link '/usr/share/zoneinfo/Europe/Paris' /etc/localtime - # locale.conf - check_file 'LANG=fr_FR.UTF-8'$'\n''LC_MESSAGES=en_US.UTF8'$'\n' /etc/locale.conf - # locales _md5="$(md5sum /etc/locale.gen)" sed -ri 's/#(en_US|fr_FR)/\1/' /etc/locale.gen @@ -45,12 +41,15 @@ post_install() { grep -q \. /etc/hostname || echo '!! /etc/hostname without FQDN' # sbin must be a symlink - [[ -L /usr/local/sbin ]] || echo '!! /usr/local/sbin is not a symlink' + if [[ ! -L /usr/local/sbin ]]; then + echo '!! /usr/local/sbin is not a symlink' + rmdir '/usr/local/sbin' && ln -sn bin /usr/local/sbin + fi # display depency info echo '-- Unused dependencies:'; pacman -Qdt echo '-- Local-only packages'; pacman -Qm - true + return 0 } # arg 1: the new package version