From 6e0e609da2efce404695cdceb99215dcc03769f7 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 29 Mar 2016 09:38:10 +0300 Subject: [PATCH] filesystem: Create minimal PATH environment. --- filesystem/PKGBUILD | 6 +++--- filesystem/profile | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 0bb7270e..4905cf27 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=filesystem -pkgver=2015.04 -pkgrel=3 +pkgver=2016.03 +pkgrel=1 pkgdesc='Base filesystem' arch=('i686' 'x86_64') license=('BSD') @@ -56,7 +56,7 @@ sha256sums=('6d651f6b0b2d173961a3fa21acd9d44c783ed9cd73a031687698c8b9ed1f6dee' '4a30e3376cf8f2699257f81a10400dca81ccd1c76308700bc56293740da3312f' '7d6994d7caf52a459b562cfb0da1d758a4b7bca478d1df00de3a96686e59008e' '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d' - '88c4888dbb71ce6b3b6bac2c38fbd16a7a4112fa5f286a54f9e28e14f232c2e4' + 'ac332166fea1c01747530176dcc6329ad29421a17cc9aa15cf2fee444395a2ac' '0a3a3b131ace34f11f428118dfe81b34da148e29b6bea3b027d79bebd47141a7' '020d0619a6af9a4d6e1068cb77f2789bcf470380426214e90177f5596d651835' '756df34c5b28478a81331785de0f56438bb652cf5f29029a9db2d83281361340' diff --git a/filesystem/profile b/filesystem/profile index 1802913b..35d78b93 100644 --- a/filesystem/profile +++ b/filesystem/profile @@ -24,30 +24,32 @@ MSYS2_PATH="/usr/local/bin:/usr/bin:/bin" MANPATH="/usr/local/man:/usr/share/man:/usr/man:/share/man:${MANPATH}" INFOPATH="/usr/local/info:/usr/share/info:/usr/info:/share/info:${INFOPATH}" +WIN_ROOT=$(PATH=${MSYS2_PATH} cygpath -wm ${SYSTEMROOT}) +WIN_PATH="${WIN_ROOT}/System32:${WIN_ROOT}:${WIN_ROOT}/System32/Wbem:${WIN_ROOT}/System32/WindowsPowerShell/v1.0/" MINGW_MOUNT_POINT= if [ -n "$MSYSTEM" ] then case "$MSYSTEM" in MINGW32) MINGW_MOUNT_POINT=/mingw32 - PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}:${PATH}" + PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}:${WIN_PATH}" PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig" ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal" MANPATH="${MINGW_MOUNT_POINT}/share/man:${MANPATH}" ;; MINGW64) MINGW_MOUNT_POINT=/mingw64 - PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}:${PATH}" + PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}:${WIN_PATH}" PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig" ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal" MANPATH="${MINGW_MOUNT_POINT}/share/man:${MANPATH}" ;; MSYS) - PATH="${MSYS2_PATH}:/opt/bin:${PATH}" + PATH="${MSYS2_PATH}:/opt/bin:${WIN_PATH}" PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig:/lib/pkgconfig" ;; *) - PATH="${MSYS2_PATH}:${PATH}" + PATH="${MSYS2_PATH}:${WIN_PATH}" ;; esac else