diff options
| -rwxr-xr-x | mkslackinfo | 5 | ||||
| -rw-r--r-- | sbostuff.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mkslackinfo b/mkslackinfo index 85967a9..70ec4cc 100755 --- a/mkslackinfo +++ b/mkslackinfo @@ -323,8 +323,9 @@ rm -rf $PRGNAM-$VERSION __EXTRACT__ cd $PRGNAM-$VERSION chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod -h 755 {} + -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod -h 644 {} + +find . ! -type l -a \ + \( -perm /111 -a ! -perm 755 -a -exec chmod -f 755 {} + \) -o \ + \( ! -perm /111 -a ! -perm 644 -a -exec chmod -f 644 {} + \) __BUILD__ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/sbostuff.sh b/sbostuff.sh index 2c15284..1bbe5ba 100644 --- a/sbostuff.sh +++ b/sbostuff.sh @@ -99,10 +99,12 @@ EOF cd "$( _cdsbexp $SBO_GITROOT/*/$1)" _set_pkg else - echo "cdsb: no exact match, guessing dir" 1>&2 + echo "cdsb: no exact match, guessing dir, partial matches:" 1>&2 + ( cd $SBO_GITROOT ; ls -dC */$1* | sed 's,^, ,' ) dir="$( _cdsbexp $SBO_GITROOT/*/$1* )" [ -z "$dir" ] && dir="$( _cdsbexp $SBO_GITROOT/*/*$1* )" if [ -n "$dir" ]; then + echo "cdsb: guessed $( echo $dir | rev | cut -d/ -f1,2 | rev )" 1>&2 cd "$dir" ret="$?" [ "$ret" = "0" ] && _set_pkg |