aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorEnno Boland <gottox@voidlinux.eu>2015-11-18 09:00:56 +0000
committerEnno Boland <gottox@voidlinux.eu>2015-11-18 09:21:33 +0000
commit18e288fd2c9ef42ee7beff5f6a4eee888f197185 (patch)
treeab9129536febdd050258905ea41a94b297ea0714 /common
parentef24b7b7cc53b654924da9ece818fc0aa1c26d01 (diff)
downloadvoid-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.tar
void-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.tar.gz
void-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.tar.bz2
void-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.tar.lz
void-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.tar.xz
void-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.tar.zst
void-packages-18e288fd2c9ef42ee7beff5f6a4eee888f197185.zip
common: remove unneccessary 'source's; move extglob.sh to install
Diffstat (limited to 'common')
-rw-r--r--common/environment/install/extglob.sh15
l---------[-rw-r--r--]common/environment/pkg/extglob.sh18
-rw-r--r--common/hooks/do-pkg/00-gen-pkg.sh2
-rw-r--r--common/hooks/pre-pkg/99-pkglint.sh2
4 files changed, 16 insertions, 21 deletions
diff --git a/common/environment/install/extglob.sh b/common/environment/install/extglob.sh
new file mode 100644
index 00000000000..048218c60dc
--- /dev/null
+++ b/common/environment/install/extglob.sh
@@ -0,0 +1,15 @@
+# This provides the extglob function to expand wildcards in the destdir
+
+expand_destdir() {
+ local glob_list= result= glob= file=
+
+ for glob; do
+ glob_list+=" $DESTDIR/$glob"
+ done
+ shopt -s extglob
+ for file in $glob_list; do
+ result+=" ${file#$DESTDIR/}"
+ done
+ shopt -u extglob
+ echo $result
+}
diff --git a/common/environment/pkg/extglob.sh b/common/environment/pkg/extglob.sh
index be620cec704..727ffaf5645 100644..120000
--- a/common/environment/pkg/extglob.sh
+++ b/common/environment/pkg/extglob.sh
@@ -1,17 +1 @@
-# This provides the extglob function to expand wildcards in the destdir
-
-expand_destdir() {
- local glob_list= result= glob= file=
-
- for glob; do
- glob_list+=" $DESTDIR/$glob"
- done
- shopt -s extglob
- for file in $glob_list; do
- result+=" ${file#$DESTDIR/}"
- done
- shopt -u extglob
- echo $result
-}
-
-
+../install/extglob.sh \ No newline at end of file
diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh
index 8ffa91d8e5a..ab010ff42f8 100644
--- a/common/hooks/do-pkg/00-gen-pkg.sh
+++ b/common/hooks/do-pkg/00-gen-pkg.sh
@@ -1,7 +1,5 @@
# This hook generates a XBPS binary package from an installed package in destdir.
-source ${XBPS_COMMONDIR}/environment/pkg/extglob.sh
-
genpkg() {
local pkgdir="$1" arch="$2" desc="$3" pkgver="$4" binpkg="$5"
local _preserve _deps _shprovides _shrequires _gitrevs _provides _conflicts
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index d584b78d7a1..e9015e25365 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,7 +1,5 @@
# This hook checks for common issues related to void.
-source ${XBPS_COMMONDIR}/environment/pkg/extglob.sh
-
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs