updated buildpkg function and hide all in Makefile and buildpkg functions
This commit is contained in:
1 parent
26b9d8118e
commit
20ca8e49ee
2 files changed
+59
-45
No files matched your search
@@ -304,7 +304,6 @@ sync() {
|
||||
servers=$(/usr/bin/cat $repofile)
|
||||
for i in $servers; do
|
||||
printf "$YELLOW**$GREEN Sync $BWHITE$i\n$RESET"
|
||||
# echo "$i"
|
||||
serverdir=$(echo $i | sed -e "/http:\//s///")
|
||||
serverdir=$(echo $serverdir | sed -e "/ftp:\//s///")
|
||||
mkdir -p $reposquerydir/$serverdir &> /dev/null
|
||||
@@ -339,7 +338,6 @@ search() {
|
||||
for j in $repoquery; do
|
||||
if [[ $j =~ $1 ]]; then
|
||||
printf "$YELLOW$serverdir: $BWHITE$j\n$RESET"
|
||||
# exit 0
|
||||
found=true
|
||||
fi
|
||||
done
|
||||
@@ -382,44 +380,60 @@ buildpkg() {
|
||||
else
|
||||
source ./PMBUILD
|
||||
fi
|
||||
[ ! -d src ] && mkdir -pv src
|
||||
[ ! -d pkg/$pkgname-$pkgver-$pkgrel.pkg ] && mkdir -pv pkg/$pkgname-$pkgver-$pkgrel.pkg
|
||||
export buildroot=$(pwd)
|
||||
export buildroot=$(pwd)
|
||||
if [ -f $buildroot/$pkgname-$pkgver-$pkgrel.pkg.gz ]; then
|
||||
if [ "$1" != "-r" ]; then
|
||||
printf "$BBLUE**$BWHITE $pkgname-$pkgver-$pkgrel.pkg.gz already exists please use -r to rebuild [$YELLOW WARNING $BWHITE]\n$RESET"
|
||||
exit 0
|
||||
else
|
||||
[ -d pkg ] && rm -r pkg
|
||||
[ -d src ] && rm -r src
|
||||
[ -f $pkgname-$pkgver-$pkgrel.pkg.gz ] && rm -r $pkgname-$pkgver-$pkgrel.pkg.gz
|
||||
fi
|
||||
fi
|
||||
[ ! -d src ] && mkdir -p src
|
||||
[ ! -d pkg/$pkgname-$pkgver-$pkgrel.pkg ] && mkdir -p pkg/$pkgname-$pkgver-$pkgrel.pkg
|
||||
export pkgdir=$buildroot/pkg/$pkgname-$pkgver-$pkgrel.pkg
|
||||
if [ "$srcdir" = "" ]; then
|
||||
export srcdir=$buildroot/src/$pkgname
|
||||
fi
|
||||
echo $pkgdir
|
||||
echo $srcdir
|
||||
if [ "$gitsource" != "" ]; then
|
||||
echo $gitsource
|
||||
printf "$BBLUE**$BWHITE Downloading sources\n$RESET"
|
||||
git clone $gitsource $srcdir
|
||||
check $? "Download sources"
|
||||
fi
|
||||
if [[ $(type -t build) = function ]]; then
|
||||
echo "yes"
|
||||
printf "$BBLUE**$BWHITE Building package\n$RESET"
|
||||
build
|
||||
check $? "Build"
|
||||
else
|
||||
echo "no"
|
||||
echo "no build"
|
||||
fi
|
||||
if [[ $(type -t package) == function ]]; then
|
||||
echo "yes"
|
||||
printf "$BBLUE**$BWHITE Packaging package\n$RESET"
|
||||
package
|
||||
check $? "Package"
|
||||
else
|
||||
echo "no"
|
||||
echo "no package"
|
||||
fi
|
||||
printf "$BBLUE**$BWHITE Stripping unneded symbols\n$RESET"
|
||||
for execfile in $(find $pkgdir -executable -type f); do
|
||||
strip $execfile
|
||||
done
|
||||
printf "$BBLUE**$BWHITE Strip unneded symbols [$BGREEN SUCCESS $BWHITE]\n$RESET"
|
||||
cd $pkgdir
|
||||
find -type f > $buildroot/list
|
||||
sed -i "s/.\///" $buildroot/list
|
||||
cd $buildroot
|
||||
mv -v list $pkgdir/list
|
||||
mv list $pkgdir/list
|
||||
if [ "$deps" != "" ]; then
|
||||
for i in $deps; do
|
||||
echo $i >> $pkgdir/deps
|
||||
done
|
||||
fi
|
||||
cd $pkgdir
|
||||
tar -czvf $buildroot/$pkgname-$pkgver-$pkgrel.pkg.gz ..
|
||||
printf "$BBLUE**$BWHITE Archiving package\n$RESET"
|
||||
tar -czf $buildroot/$pkgname-$pkgver-$pkgrel.pkg.gz .. &> /dev/null
|
||||
check $? "Archive package"
|
||||
cd $buildroot
|
||||
unset pkgdir srcdir buildroot
|
||||
|
||||
Reference in new issue
Block a user