Fix more Shellcheck violations.

pull/143/head
Ben Peachey 3 years ago committed by Joseph Werle
parent af4d935075
commit 4af346da14

@ -92,7 +92,7 @@ intro () {
}
options () {
opt NAME "$(basename $(pwd))"
opt NAME "$(basename "$(pwd)")"
opt VERSION "0.1.0"
opt DESCRIPTION ""
opt GLOBAL ""
@ -107,6 +107,7 @@ set_global () {
prompts () {
prompt NAME "name: (${NAME}) "
# shellcheck disable=SC2153
prompt VERSION "version: (${VERSION}) "
prompt DESCRIPTION "description: "
prompt INSTALL "install: (${INSTALL})"
@ -122,6 +123,7 @@ required () {
"SCRIPTS"
do
eval local val="\${${key}}"
# shellcheck disable=SC2154
[ -z "${val}" ] && error "Missing \`
${key}' property"
done
@ -206,43 +208,44 @@ clobber () {
create_shell_file () {
if [ "${NAME}.sh" == "${RAW_SCRIPTS}" ] && [ ! -f "${NAME}.sh" ]; then
{
echo "#!/bin/bash"
echo
echo "VERSION=$VERSION"
echo
echo "usage () {"
echo " echo \"$NAME [-hV]\""
echo " echo"
echo " echo \"Options:\""
echo " echo \" -h|--help Print this help dialogue and exit\""
echo " echo \" -V|--version Print the current version and exit\""
echo '}'
echo
echo "${NAME} () {"
echo " for opt in \"\${@}\"; do"
echo " case \"\$opt\" in"
echo " -h|--help)"
echo " usage"
echo " return 0"
echo " ;;"
echo " -V|--version)"
echo " echo \"\$VERSION\""
echo " return 0"
echo " ;;"
echo " esac"
echo " done"
echo
echo " ## your code here"
echo "}"
echo
echo 'if [[ ${BASH_SOURCE[0]} != "$0" ]]; then'
echo " export -f $NAME"
echo 'else'
echo " $NAME "'"${@}"'
echo ' exit $?'
echo 'fi'
} > "${NAME}.sh"
cat << EOF > "${NAME}.sh"
#!/bin/bash
VERSION=${VERSION}
usage () {
echo "${NAME} [-hV]"
echo
echo "Options:"
echo " -h|--help Print this help dialogue and exit"
echo " -V|--version Print the current version and exit"
}
${NAME} () {
for opt in "\${@}"; do
case "\${opt}" in
-h|--help)
usage
return 0
;;
-V|--version)
echo "\${VERSION}"
return 0
;;
esac
done
## your code here
}
if [[ \${BASH_SOURCE[0]} != "\$0" ]]; then
export -f ${NAME}
else
${NAME} "\${@}"
exit $?
fi
EOF
chmod 755 "${NAME}.sh"
fi
}

@ -398,7 +398,7 @@ bpkg_install_from_remote () {
if [[ -z "${build}" ]]; then
warn 'Missing build script'
warn 'Trying `make install`...'
warn 'Trying "make install"...'
build='make install'
fi

@ -112,7 +112,7 @@ parse_array () {
done
;;
esac
[ "$BRIEF" -eq 0 ] && value=`printf '[%s]' "$ary"` || value=
[ "$BRIEF" -eq 0 ] && value=$(printf '[%s]' "$ary") || value=
:
}
@ -147,7 +147,7 @@ parse_object () {
done
;;
esac
[ "$BRIEF" -eq 0 ] && value=`printf '{%s}' "$obj"` || value=
[ "$BRIEF" -eq 0 ] && value=$(printf '{%s}' "$obj") || value=
:
}
@ -185,7 +185,7 @@ parse () {
parse_options "$@"
if ([ "$0" = "$BASH_SOURCE" ] || ! [ -n "$BASH_SOURCE" ]);
if [ "$0" = "${BASH_SOURCE}" ] || [ -z "${BASH_SOURCE}" ];
then
tokenize | parse
fi

@ -58,7 +58,8 @@ bpkg_list () {
fi
OLDIFS="$IFS"
IFS=$'\n'
for line in $(cat "$BPKG_REMOTE_INDEX_FILE"); do
local line
while read -r line; do
local desc name
name=$(echo "$line" | cut -d\| -f1 | tr -d ' ')
desc=$(echo "$line" | cut -d\| -f2)
@ -68,7 +69,8 @@ bpkg_list () {
else
echo "$name"
fi
done
done < "${BPKG_REMOTE_INDEX_FILE}"
IFS="$OLDIFS"
i=$((i+1))
done

@ -100,7 +100,7 @@ show_package () {
# Show Sources
OLDIFS="$IFS"
IFS=$'\n'
for src in $(echo "$sources"); do
for src in $sources; do
local content http_code
http_code=$(eval "curl $auth -sL '$uri/$src?$(date +%s)' -w '%{http_code}' -o /dev/null")
if (( http_code < 400 )); then
@ -174,7 +174,8 @@ bpkg_show () {
OLDIFS="$IFS"
IFS=$'\n'
for line in $(cat "$BPKG_REMOTE_INDEX_FILE"); do
local line
while read -r line; do
local desc name
name=$(echo "$line" | cut -d\| -f1 | tr -d ' ')
desc=$(echo "$line" | cut -d\| -f2)
@ -184,7 +185,8 @@ bpkg_show () {
IFS=$'\n'
return 0
fi
done
done < "${BPKG_REMOTE_INDEX_FILE}"
IFS="$OLDIFS"
i=$((i+1))
done

@ -38,7 +38,7 @@ suggest () {
## search path
{
local res=""
IFS=':' read -a paths <<< "${PATH}"
IFS=':' read -ar paths <<< "${PATH}"
for (( i = 0; i < ${#paths[@]}; ++i )); do
local path="${paths[$i]}"
local skip=0

Loading…
Cancel
Save