From d8d0eb0e6549834f63beb008799a5d60113231fd Mon Sep 17 00:00:00 2001 From: emmett1 Date: Sat, 9 Jun 2018 17:22:13 +0800 Subject: [PATCH] updated --- buildpkg | 18 +++++++++--------- extra/{s-portcretae => s-portcreate} | 0 functions/options | 7 ++++++- installpkg | 2 +- scratch | 8 ++++---- 5 files changed, 20 insertions(+), 15 deletions(-) rename extra/{s-portcretae => s-portcreate} (100%) diff --git a/buildpkg b/buildpkg index 52ae453..f721567 100755 --- a/buildpkg +++ b/buildpkg @@ -393,20 +393,20 @@ checkdeps() { fi done - for makedep in ${makedepends[@]}; do - if [ ! -d $INDEX_DIR/$makedep ]; then - MSMKDEP+=($makedep) - fi - done + #for makedep in ${makedepends[@]}; do + #if [ ! -d $INDEX_DIR/$makedep ]; then + #MSMKDEP+=($makedep) + #fi + #done - if [ "${#MSDEP[@]}" -gt 0 ] || [ "${#MSMKDEP[@]}" -gt 0 ]; then + if [ "${#MSDEP[@]}" -gt 0 ]; then msg "Missing dependencies:" for msd in ${MSDEP[@]}; do msg2 "$msd" done - for msmkd in ${MSMKDEP[@]}; do - msg2 "$msmkd ${CYAN}(make)${CRESET}" - done + #for msmkd in ${MSMKDEP[@]}; do + #msg2 "$msmkd ${CYAN}(make)${CRESET}" + #done exitscript1 fi diff --git a/extra/s-portcretae b/extra/s-portcreate similarity index 100% rename from extra/s-portcretae rename to extra/s-portcreate diff --git a/functions/options b/functions/options index 4846588..8e0842d 100644 --- a/functions/options +++ b/functions/options @@ -100,7 +100,12 @@ compressinfomanpages() { if [ -d $mandir ]; then (cd $mandir find . -type f ! -name "*.gz" -exec gzip -9 -f {} \; 2>/dev/null - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done + for i in $(find . -type l) ; do + if [ $(readlink $i) = ${i%%.gz} ]; then + ln -s $(readlink $i).gz $i.gz + rm $i + fi + done ) fi done diff --git a/installpkg b/installpkg index 9b3e76c..16826a3 100755 --- a/installpkg +++ b/installpkg @@ -70,7 +70,7 @@ installpkg() { } rm -f /tmp/spkginstall.$name - installcmd $PKGNAME | while IFS=' ' read line; do + LC_ALL= installcmd $PKGNAME | while IFS=' ' read line; do if [ "$line" = "${line%.*}.spkgnew" ]; then line=${line%.*} if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then diff --git a/scratch b/scratch index 36b1fc4..8fcb173 100755 --- a/scratch +++ b/scratch @@ -99,9 +99,9 @@ checkdep() { echo $dep done - for mdep in ${makedepends[@]}; do - echo $mdep - done + #for mdep in ${makedepends[@]}; do + # echo $mdep + #done } @@ -807,7 +807,7 @@ if [ "$mode" = "build" ]; then parseopt() { while [ "$1" ]; do case $1 in - -f|-m|-d|-e|-w|-o|--srcdir=*|--pkgdir=*) OPTS+=($1) ;; + -f|-m|-d|-e|-w|-o|-v|--verbose|--srcdir=*|--pkgdir=*) OPTS+=($1) ;; --skip-mdsum|--no-dep|--extract|--keep-work|--download) OPTS+=($1) ;; --force-rebuild|--redownload|--no-preinstall) OPTS+=($1) ;; -*) msgerr "Invalid option! ($1)"; exit 1 ;;