Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Wiki Activity

fix shell script issues identified through shellcheck

Browse Source
This commit is contained in:
a1346054 2021-08-14 22:04:50 +00:00
parent 3f24f7cbcf
commit 91dcf52972
4 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
completions/bash/exa
View File

@ -19,12 +19,12 @@ _exa()
;; ;;
-t|--time) -t|--time)
COMPREPLY=( $( compgen -W 'modified changed accessed created --' -- $cur ) ) COMPREPLY=( $( compgen -W 'modified changed accessed created --' -- "$cur" ) )
return return
;; ;;
--time-style) --time-style)
COMPREPLY=( $( compgen -W 'default iso long-iso full-iso --' -- $cur ) ) COMPREPLY=( $( compgen -W 'default iso long-iso full-iso --' -- "$cur" ) )
return return
;; ;;
esac esac

19
devtools/dev-bash.sh
View File

@ -11,17 +11,17 @@ bash /vagrant/devtools/dev-versions.sh
# Configure the Cool Prompt™ (not actually trademarked). # Configure the Cool Prompt™ (not actually trademarked).
# The Cool Prompt tells you whether you’re in debug or strict mode, whether # The Cool Prompt tells you whether you’re in debug or strict mode, whether
# you have colours configured, and whether your last command failed. # you have colours configured, and whether your last command failed.
function nonzero_return() { RETVAL=$?; [ $RETVAL -ne 0 ] && echo "$RETVAL "; } nonzero_return() { RETVAL=$?; [ "$RETVAL" -ne 0 ] && echo "$RETVAL "; }
function debug_mode() { [ "$EXA_DEBUG" == "trace" ] && echo -n "trace-"; [ -n "$EXA_DEBUG" ] && echo "debug "; } debug_mode() { [ "$EXA_DEBUG" == "trace" ] && echo -n "trace-"; [ -n "$EXA_DEBUG" ] && echo "debug "; }
function strict_mode() { [ -n "$EXA_STRICT" ] && echo "strict "; } strict_mode() { [ -n "$EXA_STRICT" ] && echo "strict "; }
function lsc_mode() { [ -n "$LS_COLORS" ] && echo "lsc "; } lsc_mode() { [ -n "$LS_COLORS" ] && echo "lsc "; }
function exac_mode() { [ -n "$EXA_COLORS" ] && echo "exac "; } exac_mode() { [ -n "$EXA_COLORS" ] && echo "exac "; }
export PS1="\[\e[1;36m\]\h \[\e[32m\]\w \[\e[31m\]\`nonzero_return\`\[\e[35m\]\`debug_mode\`\[\e[32m\]\`lsc_mode\`\[\e[1;32m\]\`exac_mode\`\[\e[33m\]\`strict_mode\`\[\e[36m\]\\$\[\e[0m\] " export PS1="\[\e[1;36m\]\h \[\e[32m\]\w \[\e[31m\]\`nonzero_return\`\[\e[35m\]\`debug_mode\`\[\e[32m\]\`lsc_mode\`\[\e[1;32m\]\`exac_mode\`\[\e[33m\]\`strict_mode\`\[\e[36m\]\\$\[\e[0m\] "
# The ‘debug’ function lets you switch debug mode on and off. # The ‘debug’ function lets you switch debug mode on and off.
# Turn it on if you need to see exa’s debugging logs. # Turn it on if you need to see exa’s debugging logs.
function debug () { debug() {
case "$1" in case "$1" in
""|"on") export EXA_DEBUG=1 ;; ""|"on") export EXA_DEBUG=1 ;;
"off") export EXA_DEBUG= ;; "off") export EXA_DEBUG= ;;
@ -33,8 +33,9 @@ function debug () {
# The ‘strict’ function lets you switch strict mode on and off. # The ‘strict’ function lets you switch strict mode on and off.
# Turn it on if you’d like exa’s command-line arguments checked. # Turn it on if you’d like exa’s command-line arguments checked.
function strict () { strict() {
case "$1" in "on") export EXA_STRICT=1 ;; case "$1" in
"on") export EXA_STRICT=1 ;;
"off") export EXA_STRICT= ;; "off") export EXA_STRICT= ;;
"") [ -n "$EXA_STRICT" ] && echo "strict on" || echo "strict off" ;; "") [ -n "$EXA_STRICT" ] && echo "strict on" || echo "strict off" ;;
*) echo "Usage: strict on|off"; return 1 ;; *) echo "Usage: strict on|off"; return 1 ;;
@ -45,7 +46,7 @@ function strict () {
# environment variables. There’s also a ‘hacker’ theme which turns everything # environment variables. There’s also a ‘hacker’ theme which turns everything
# green, which is usually used for checking that all colour codes work, and # green, which is usually used for checking that all colour codes work, and
# for looking cool while you phreak some mainframes or whatever. # for looking cool while you phreak some mainframes or whatever.
function colors () { colors() {
case "$1" in case "$1" in
"ls") "ls")
export LS_COLORS="di=34:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43" export LS_COLORS="di=34:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"

13
devtools/dev-package-for-linux.sh
View File

@ -9,7 +9,7 @@ set -e
# Linux check! # Linux check!
uname=`uname -s` uname=$(uname -s)
if [[ "$uname" != "Linux" ]]; then if [[ "$uname" != "Linux" ]]; then
echo "Gotta be on Linux to run this (detected '$uname')!" echo "Gotta be on Linux to run this (detected '$uname')!"
exit 1 exit 1
@ -29,8 +29,8 @@ fi
# Weekly builds have a bit more information in their version number (see build.rs). # Weekly builds have a bit more information in their version number (see build.rs).
if [[ "$1" == "--weekly" ]]; then if [[ "$1" == "--weekly" ]]; then
git_hash=`GIT_DIR=/vagrant/.git git rev-parse --short --verify HEAD` git_hash=$(GIT_DIR=/vagrant/.git git rev-parse --short --verify HEAD)
date=`date +"%Y-%m-%d"` date=$(date +"%Y-%m-%d")
echo "Building exa weekly v$exa_version, date $date, Git hash $git_hash" echo "Building exa weekly v$exa_version, date $date, Git hash $git_hash"
else else
echo "Building exa v$exa_version" echo "Building exa v$exa_version"
@ -57,9 +57,10 @@ strip -v "$exa_linux_binary"
# the binaries can have consistent names, and it’s still possible to tell # the binaries can have consistent names, and it’s still possible to tell
# different *downloads* apart. # different *downloads* apart.
echo -e "\n\033[4mZipping binary...\033[0m" echo -e "\n\033[4mZipping binary...\033[0m"
if [[ "$1" == "--weekly" ]] if [[ "$1" == "--weekly" ]]; then
then exa_linux_zip="/vagrant/exa-linux-x86_64-${exa_version}-${date}-${git_hash}.zip" exa_linux_zip="/vagrant/exa-linux-x86_64-${exa_version}-${date}-${git_hash}.zip"
else exa_linux_zip="/vagrant/exa-linux-x86_64.zip" else
exa_linux_zip="/vagrant/exa-linux-x86_64.zip"
fi fi
rm -vf "$exa_linux_zip" rm -vf "$exa_linux_zip"
zip -j "$exa_linux_zip" "$exa_linux_binary" zip -j "$exa_linux_zip" "$exa_linux_binary"

13
devtools/local-package-for-macos.sh
View File

@ -11,7 +11,7 @@ set -e
# Virtualising macOS is a legal minefield, so this script is ‘local’ instead # Virtualising macOS is a legal minefield, so this script is ‘local’ instead
# of ‘dev’: I run it from my actual machine, rather than from a VM. # of ‘dev’: I run it from my actual machine, rather than from a VM.
uname=`uname -s` uname=$(uname -s)
if [[ "$uname" != "Darwin" ]]; then if [[ "$uname" != "Darwin" ]]; then
echo "Gotta be on Darwin to run this (detected '$uname')!" echo "Gotta be on Darwin to run this (detected '$uname')!"
exit 1 exit 1
@ -36,8 +36,8 @@ fi
# Weekly builds have a bit more information in their version number (see build.rs). # Weekly builds have a bit more information in their version number (see build.rs).
if [[ "$1" == "--weekly" ]]; then if [[ "$1" == "--weekly" ]]; then
git_hash=`GIT_DIR=$exa_root/.git git rev-parse --short --verify HEAD` git_hash=$(GIT_DIR=$exa_root/.git git rev-parse --short --verify HEAD)
date=`date +"%Y-%m-%d"` date=$(date +"%Y-%m-%d")
echo "Building exa weekly v$exa_version, date $date, Git hash $git_hash" echo "Building exa weekly v$exa_version, date $date, Git hash $git_hash"
else else
echo "Building exa v$exa_version" echo "Building exa v$exa_version"
@ -65,9 +65,10 @@ echo "strip $exa_macos_binary"
# the binaries can have consistent names, and it’s still possible to tell # the binaries can have consistent names, and it’s still possible to tell
# different *downloads* apart. # different *downloads* apart.
echo -e "\n\033[4mZipping binary...\033[0m" echo -e "\n\033[4mZipping binary...\033[0m"
if [[ "$1" == "--weekly" ]] if [[ "$1" == "--weekly" ]]; then
then exa_macos_zip="$exa_root/exa-macos-x86_64-${exa_version}-${date}-${git_hash}.zip" exa_macos_zip="$exa_root/exa-macos-x86_64-${exa_version}-${date}-${git_hash}.zip"
else exa_macos_zip="$exa_root/exa-macos-x86_64-${exa_version}.zip" else
exa_macos_zip="$exa_root/exa-macos-x86_64-${exa_version}.zip"
fi fi
rm -vf "$exa_macos_zip" | sed 's/^/removing /' rm -vf "$exa_macos_zip" | sed 's/^/removing /'
zip -j "$exa_macos_zip" "$exa_macos_binary" zip -j "$exa_macos_zip" "$exa_macos_binary"