diff --git a/filesystem/05-home-dir.post b/filesystem/05-home-dir.post index 38578490..5d0bcab3 100644 --- a/filesystem/05-home-dir.post +++ b/filesystem/05-home-dir.post @@ -1,7 +1,7 @@ maybe_create_home () { # Set the user id - USER="$(id -un)" + USER="$(exec id -un)" # Default to removing the write permission for group and other # (files normally created with mode 777 become 755; files created with diff --git a/filesystem/06-windows-files.post b/filesystem/06-windows-files.post index ff1ba8da..fbedb379 100644 --- a/filesystem/06-windows-files.post +++ b/filesystem/06-windows-files.post @@ -1,7 +1,7 @@ maybe_create_winetc () { local FILES="hosts protocols services networks" - local WINSYS32HOME="$(/usr/bin/cygpath -S -w)" + local WINSYS32HOME="$(exec /usr/bin/cygpath -S -w)" local WINETC="${WINSYS32HOME}\\drivers\\etc" if [ ! -d "${WINETC}" ]; then @@ -16,7 +16,7 @@ maybe_create_winetc () if [ ! -e "/etc/${mketc}" -a ! -L "/etc/${mketc}" ] then # Windows only uses the first 8 characters - local WFILE="${WINETC}\\$(expr substr "${mketc}" 1 8)" + local WFILE="${WINETC}\\$(exec expr substr "${mketc}" 1 8)" /usr/bin/cp -p -v "${WFILE}" "/etc/${mketc}" fi done diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 10df9eed..4f52f8fc 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Alethea Rose pkgname=filesystem -pkgver=2018.02 -pkgrel=2 +pkgver=2018.03 +pkgrel=1 pkgdesc='Base filesystem' arch=('i686' 'x86_64') license=('BSD') @@ -62,17 +62,17 @@ sha256sums=('6d651f6b0b2d173961a3fa21acd9d44c783ed9cd73a031687698c8b9ed1f6dee' 'a32c0b84b65364ccce27f9db3c054b83d842721c87d4821f757594575319d77a' '3c1da9bf6ff791c32f17e49db0047b3c9cbaacd44d6d0b92696cdeacebf8f947' '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d' - '4973827f59fed69911bc0b3e4ad7f9ee6aac0ee120b38ded0a46a7302044dd36' - '0a3a3b131ace34f11f428118dfe81b34da148e29b6bea3b027d79bebd47141a7' - '020d0619a6af9a4d6e1068cb77f2789bcf470380426214e90177f5596d651835' + '68ad4e1f55c1fe092905808f825efc68df7a8d787abce4d02a3bb3c2d3daf119' + '67e9285cdadb484ccf7e189f0872d2282171de2da4796e63471471ca37cf01c5' + '7a844eb4cb915b91c3d4a5ec6bb4ba9253b7446aac698fe7689855341b381eaa' '756df34c5b28478a81331785de0f56438bb652cf5f29029a9db2d83281361340' '2087410bf7ead6fa586628ea7fc97c53f5ea3ce16d1ee91ecc15ccc18ab53094' 'f63241cc56aa7b7ec6962d19991d211b4e1641b78ba5226835118ab493830a8b' 'e96c1f54ffff792e738aa032815c82c30821b0683806e5ed0ba2a759db2fd494' '95105051d31ecbe4ace262a4496ec1055bdd14d61b7d475a771b56fe15f8ccd9' 'd7b7eb4cd9e1f9bc227b009cdcacf700f5523ccc109fbd3c1c0331726d314c9e' - '351fc143ab0510f273af5f238d75d5452bdc250735ac83c53f4999a0fd6c0f4f' - '9aa47f4d8b781906136d39d10fa9c007e9ff7433624213c7db7a03e906e804ba' + '0c479c8094a68c65a47066036659ae650da2751e307f52e4c78b86a0b2f9be2f' + 'fedaf4d9ae282f6c1698d04d280dd48c8d3247321a5cb5e309e61e2c655102c6' 'fd6eb255b5a35e62a34a54bf39598134296a11bddd3e6a30edd008cbe136b9f3' 'ad8533809ea2b1bce0a41b3a0a24dbc7a9f58b992ceb40cc9f862b1978032790' 'b9af554432605fe4027fbc231170e01edb5bcbb958bfd0922609f1901a2dd555' diff --git a/filesystem/profile b/filesystem/profile index e9400903..afaa1cb1 100644 --- a/filesystem/profile +++ b/filesystem/profile @@ -40,7 +40,7 @@ case "${MSYS2_PATH_TYPE:-minimal}" in *) # Do not inherit any path configuration but configure a default Windows path # suitable for normal usage with minimal external interference. - WIN_ROOT="$(PATH=${MSYS2_PATH} cygpath -Wu)" + WIN_ROOT="$(PATH=${MSYS2_PATH} exec cygpath -Wu)" ORIGINAL_PATH="${WIN_ROOT}/System32:${WIN_ROOT}:${WIN_ROOT}/System32/Wbem:${WIN_ROOT}/System32/WindowsPowerShell/v1.0/" esac @@ -84,8 +84,8 @@ SYSCONFDIR="${SYSCONFDIR:=/etc}" ORIGINAL_TMP="${ORIGINAL_TMP:-${TMP}}" ORIGINAL_TEMP="${ORIGINAL_TEMP:-${TEMP}}" unset TMP TEMP -tmp=$(cygpath -w "$ORIGINAL_TMP" 2> /dev/null) -temp=$(cygpath -w "$ORIGINAL_TEMP" 2> /dev/null) +tmp=$(exec cygpath -w "$ORIGINAL_TMP" 2> /dev/null) +temp=$(exec cygpath -w "$ORIGINAL_TEMP" 2> /dev/null) TMP="/tmp" TEMP="/tmp" @@ -125,23 +125,23 @@ for postinst in $(export LC_COLLATE=C; echo /etc/post-install/*.post); do done if [ ! "x${BASH_VERSION}" = "x" ]; then - HOSTNAME="$(/usr/bin/hostname)" + HOSTNAME="$(exec /usr/bin/hostname)" profile_d sh [ -f "/etc/bash.bashrc" ] && . "/etc/bash.bashrc" elif [ ! "x${KSH_VERSION}" = "x" ]; then - typeset -l HOSTNAME="$(/usr/bin/hostname)" + typeset -l HOSTNAME="$(exec /usr/bin/hostname)" profile_d sh PS1=$(print '\033]0;${PWD}\n\033[32m${USER}@${HOSTNAME} \033[33m${PWD/${HOME}/~}\033[0m\n$ ') elif [ ! "x${ZSH_VERSION}" = "x" ]; then - HOSTNAME="$(/usr/bin/hostname)" + HOSTNAME="$(exec /usr/bin/hostname)" profile_d sh profile_d zsh PS1='(%n@%m)[%h] %~ %% ' elif [ ! "x${POSH_VERSION}" = "x" ]; then - HOSTNAME="$(/usr/bin/hostname)" + HOSTNAME="$(exec /usr/bin/hostname)" PS1="$ " else - HOSTNAME="$(/usr/bin/hostname)" + HOSTNAME="$(exec /usr/bin/hostname)" profile_d sh PS1="$ " fi diff --git a/filesystem/profile.lang.sh b/filesystem/profile.lang.sh index 0e2b763d..5fdd6328 100644 --- a/filesystem/profile.lang.sh +++ b/filesystem/profile.lang.sh @@ -16,4 +16,4 @@ # System-wide lang.sh file # if no locale variable is set, indicate terminal charset via LANG -test -z "${LC_ALL:-${LC_CTYPE:-$LANG}}" && export LANG=$(/usr/bin/locale -uU) +test -z "${LC_ALL:-${LC_CTYPE:-$LANG}}" && export LANG=$(exec /usr/bin/locale -uU) diff --git a/filesystem/profile.tzset.sh b/filesystem/profile.tzset.sh index 7c177675..ba60e6d8 100644 --- a/filesystem/profile.tzset.sh +++ b/filesystem/profile.tzset.sh @@ -19,4 +19,4 @@ #mapping, rather than the locale setting. Only on Windows 2000 which #doesn't know about the user's geographical location, or if fetching #the geographical location fails, it falls back to the user's locale. -test -z "$TZ" && export TZ=$(/usr/bin/tzset) +test -z "$TZ" && export TZ=$(exec /usr/bin/tzset)