bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: fix syntax not supported by some BSD shells

Browse Source 
Needs further investigation.
This commit is contained in:
Dylan Araps 2021-08-09 08:12:28 +03:00
parent fc99f6c44f
commit dfc2070d95
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kiss
View File

@ -297,7 +297,7 @@ _pkg_find() {
# values in variables. If there are 4 arguments, no package has been found. # values in variables. If there are 4 arguments, no package has been found.
case $2-$# in case $2-$# in
*-4) return 1 ;; *-4) return 1 ;;
-*) repo_dir=$5 repo_name=${5##*/} ;; -*) repo_dir=$5; repo_name=${5##*/} ;;
*) shift 4; printf '%s\n' "$@" *) shift 4; printf '%s\n' "$@"
esac esac
} }
@ -449,7 +449,9 @@ pkg_source_git() {
log "$repo_name" "Cloning $1" log "$repo_name" "Cloning $1"
# Split the source into URL + OBJECT (branch or commit). # Split the source into URL + OBJECT (branch or commit).
url=$1 com=${url##*[@#]} com=${com#${url%[#@]*}} url=$1
com=${url##*[@#]}
com=${com#${url%[#@]*}}
git init git init
git remote add origin "${url%[#@]*}" git remote add origin "${url%[#@]*}"
@ -1241,7 +1243,9 @@ file_rwx() {
# #
# NOTE: This drops setgid/setuid permissions and does not include # NOTE: This drops setgid/setuid permissions and does not include
# them in the conversion. This is intentional. # them in the conversion. This is intentional.
rwx=$(ls -ld "$1") oct='' o=0 unset oct o
rwx=$(ls -ld "$1")
for c in 14 22 31 44 52 61 74 82 91; do for c in 14 22 31 44 52 61 74 82 91; do
rwx=${rwx#?} rwx=${rwx#?}
@ -1252,7 +1256,8 @@ file_rwx() {
esac esac
case $((${c%?} % 3)) in 0) case $((${c%?} % 3)) in 0)
oct=$oct$o o=0 oct=$oct$o
o=0
esac esac
done done
} }
@ -1734,8 +1739,14 @@ pkg_help_ext() {
# first match. # first match.
for path do p=${path#*/kiss-} for path do p=${path#*/kiss-}
case " $seen " in case " $seen " in
*" $p "*) shift ;; *" $p "*)
*) seen=" $seen $p " max=$((${#p} > max ? ${#p}+1 : max)) shift
;;
*)
seen=" $seen $p "
max=$((${#p} > max ? ${#p}+1 : max))
;;
esac esac
done done
@ -1917,8 +1928,11 @@ main() {
# Color can be disabled via the environment variable KISS_COLOR. Colors are # Color can be disabled via the environment variable KISS_COLOR. Colors are
# also automatically disabled if output is being used in a pipe/redirection. # also automatically disabled if output is being used in a pipe/redirection.
equ "$KISS_COLOR" 0 || ! [ -t 2 ] || equ "$KISS_COLOR" 0 || ! [ -t 2 ] || {
c1='\033[1;33m' c2='\033[1;34m' c3='\033[m' c1='\033[1;33m'
c2='\033[1;34m'
c3='\033[m'
}
# Store the original working directory to ensure that relative paths # Store the original working directory to ensure that relative paths
# passed by the user on the command-line properly resolve to locations # passed by the user on the command-line properly resolve to locations