psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-22 23:35:35 -05:00
Code Issues Releases Wiki Activity

Use short if form instead of &&

Browse source 
See
http://zsh.sourceforge.net/Doc/Release/Shell-Grammar.html#Alternate-Forms-For-Complex-Commands
This commit is contained in:
Eric Nielsen 2020-02-03 20:43:36 -05:00
parent 13fb1ead73
commit b3c7fde730
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
12 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stage2/22_zimfw_print.zsh.erb
View file

@ -1,5 +1,3 @@
_zimfw_print() { _zimfw_print() {
if (( _zprintlevel > 0 )); then if (( _zprintlevel > 0 )) print "${@}"
print "${@}"
fi
} }

4
src/stage2/29_zimfw_build_init.zsh.erb
View file

@ -6,8 +6,8 @@ _zimfw_build_init() {
fi fi
_zimfw_mv =( _zimfw_mv =(
print -R "zimfw() { source ${ZIM_HOME}/zimfw.zsh \"\${@}\" }" print -R "zimfw() { source ${ZIM_HOME}/zimfw.zsh \"\${@}\" }"
(( ${#_zfpaths} )) && print -R 'fpath=('${_zfpaths:A}' ${fpath})' if (( ${#_zfpaths} )) print -R 'fpath=('${_zfpaths:A}' ${fpath})'
(( ${#_zfunctions} )) && print -R 'autoload -Uz '${_zfunctions} if (( ${#_zfunctions} )) print -R 'autoload -Uz '${_zfunctions}
print -Rn ${(F):-source ${^_zscripts:A}} print -Rn ${(F):-source ${^_zscripts:A}}
) ${ztarget} ) ${ztarget}
} }

6
src/stage2/30_zmodule.zsh.erb
View file

@ -73,7 +73,7 @@ Startup options:
-f|--fpath) -f|--fpath)
shift shift
zarg=${1} zarg=${1}
[[ ${zarg} != /* ]] && zarg=${zdir}/${zarg} if [[ ${zarg} != /* ]] zarg=${zdir}/${zarg}
zfpaths+=(${zarg}) zfpaths+=(${zarg})
;; ;;
-a|--autoload) -a|--autoload)
@ -83,7 +83,7 @@ Startup options:
-s|--source) -s|--source)
shift shift
zarg=${1} zarg=${1}
[[ ${zarg} != /* ]] && zarg=${zdir}/${zarg} if [[ ${zarg} != /* ]] zarg=${zdir}/${zarg}
zscripts+=(${zarg}) zscripts+=(${zarg})
;; ;;
-d|--disabled) zdisabled=1 ;; -d|--disabled) zdisabled=1 ;;
@ -108,7 +108,7 @@ Startup options:
_zfailed=1 _zfailed=1
return 1 return 1
fi fi
(( ! ${#zfpaths} )) && zfpaths+=(${zdir}/functions(NF)) if (( ! ${#zfpaths} )) zfpaths+=(${zdir}/functions(NF))
if (( ! ${#zfunctions} )); then if (( ! ${#zfunctions} )); then
# _* functions are autoloaded by compinit # _* functions are autoloaded by compinit
# prompt_*_setup functions are autoloaded by promptinit # prompt_*_setup functions are autoloaded by promptinit

2
src/stage2/50_zimfw_clean_compiled.zsh.erb
View file

@ -1,6 +1,6 @@
_zimfw_clean_compiled() { _zimfw_clean_compiled() {
local zopt local zopt
(( _zprintlevel > 0 )) && zopt='-v' if (( _zprintlevel > 0 )) zopt='-v'
command rm -f ${zopt} ${ZIM_HOME}/**/*.zwc(|.old) || return 1 command rm -f ${zopt} ${ZIM_HOME}/**/*.zwc(|.old) || return 1
command rm -f ${zopt} <%= home %>/<%= startup_files_glob %>.zwc(|.old)(N) || return 1 command rm -f ${zopt} <%= home %>/<%= startup_files_glob %>.zwc(|.old)(N) || return 1
_zimfw_print -P '<%= done %>Done with clean-compiled. Run %Bzimfw compile%b to re-compile.' _zimfw_print -P '<%= done %>Done with clean-compiled. Run %Bzimfw compile%b to re-compile.'

2
src/stage2/50_zimfw_clean_dumpfile.zsh.erb
View file

@ -1,7 +1,7 @@
_zimfw_clean_dumpfile() { _zimfw_clean_dumpfile() {
local zdumpfile zopt local zdumpfile zopt
zstyle -s ':zim:completion' dumpfile 'zdumpfile' || zdumpfile=<%= home %>/.zcompdump zstyle -s ':zim:completion' dumpfile 'zdumpfile' || zdumpfile=<%= home %>/.zcompdump
(( _zprintlevel > 0 )) && zopt='-v' if (( _zprintlevel > 0 )) zopt='-v'
command rm -f ${zopt} ${zdumpfile}(|.zwc(|.old))(N) || return 1 command rm -f ${zopt} ${zdumpfile}(|.zwc(|.old))(N) || return 1
_zimfw_print -P '<%= done %>Done with clean-dumpfile. Restart your terminal to dump an updated configuration.' _zimfw_print -P '<%= done %>Done with clean-dumpfile. Restart your terminal to dump an updated configuration.'
} }

2
src/stage2/50_zimfw_compile.zsh.erb
View file

@ -1,5 +1,5 @@
_zimfw_compile() { _zimfw_compile() {
local zopt local zopt
(( _zprintlevel <= 0 )) && zopt='-q' if (( _zprintlevel <= 0 )) zopt='-q'
source ${ZIM_HOME}/login_init.zsh ${zopt} source ${ZIM_HOME}/login_init.zsh ${zopt}
} }

2
src/stage2/50_zimfw_uninstall.zsh.erb
View file

@ -1,6 +1,6 @@
_zimfw_uninstall() { _zimfw_uninstall() {
local zopt zdir zmodule local zopt zdir zmodule
(( _zprintlevel > 0 )) && zopt='-v' if (( _zprintlevel > 0 )) zopt='-v'
for zdir in ${ZIM_HOME}/modules/*(N/); do for zdir in ${ZIM_HOME}/modules/*(N/); do
zmodule=${zdir:t} zmodule=${zdir:t}
# If _zmodules and _zdisableds do not contain the zmodule # If _zmodules and _zdisableds do not contain the zmodule

4
src/stage2/50_zimfw_upgrade.zsh.erb
View file

@ -7,9 +7,9 @@ _zimfw_upgrade() {
command curl -fsSL ${zurl} | command gunzip > ${ztarget}.new || return 1 command curl -fsSL ${zurl} | command gunzip > ${ztarget}.new || return 1
else else
local zopt local zopt
(( _zprintlevel <= 1 )) && zopt='-q' if (( _zprintlevel <= 1 )) zopt='-q'
if ! command wget -nv ${zopt} -O - ${zurl} | command gunzip > ${ztarget}.new; then if ! command wget -nv ${zopt} -O - ${zurl} | command gunzip > ${ztarget}.new; then
(( _zprintlevel <= 1 )) && print -u2 -PR "%F{red}<%= error %>Error downloading %B${zurl}%b. Use %B-v%b option to see details.%f" if (( _zprintlevel <= 1 )) print -u2 -PR "%F{red}<%= error %>Error downloading %B${zurl}%b. Use %B-v%b option to see details.%f"
return 1 return 1
fi fi
fi fi

6
src/tools/install.zsh.erb
View file

@ -9,11 +9,9 @@ if [[ -e ${DIR} ]]; then
# Already exists # Already exists
return 0 return 0
fi fi
(( PRINTLEVEL > 0 )) && print -Rn ${CLEAR_LINE}"Installing ${MODULE}<%= ellipsis %>" if (( PRINTLEVEL > 0 )) print -Rn ${CLEAR_LINE}"Installing ${MODULE}<%= ellipsis %>"
if ERR=$(command git clone -b ${REV} -q --recursive ${URL} ${DIR} 2>&1); then if ERR=$(command git clone -b ${REV} -q --recursive ${URL} ${DIR} 2>&1); then
if (( PRINTLEVEL > 0 )); then if (( PRINTLEVEL > 0 )) print -PR ${CLEAR_LINE}"<%= okay %>%B${MODULE}:%b Installed"
print -PR ${CLEAR_LINE}"<%= okay %>%B${MODULE}:%b Installed"
fi
else else
print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b Error during git clone%f"$'\n'${(F):- ${(f)^ERR}} print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b Error during git clone%f"$'\n'${(F):- ${(f)^ERR}}
return 1 return 1

6
src/tools/update.zsh.erb
View file

@ -6,7 +6,7 @@ readonly TYPE=${4}
readonly REV=${5} readonly REV=${5}
readonly -i PRINTLEVEL=${6} readonly -i PRINTLEVEL=${6}
readonly CLEAR_LINE=$'\E[2K\r' readonly CLEAR_LINE=$'\E[2K\r'
(( PRINTLEVEL > 0 )) && print -Rn ${CLEAR_LINE}"Updating ${MODULE}<%= ellipsis %>" if (( PRINTLEVEL > 0 )) print -Rn ${CLEAR_LINE}"Updating ${MODULE}<%= ellipsis %>"
if ! builtin cd -q ${DIR} 2>/dev/null; then if ! builtin cd -q ${DIR} 2>/dev/null; then
print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b Not installed%f" print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b Not installed%f"
return 1 return 1
@ -21,7 +21,7 @@ if [[ ${URL} != $(command git config --get remote.origin.url) ]]; then
fi fi
if [[ ${TYPE} == tag ]]; then if [[ ${TYPE} == tag ]]; then
if [[ ${REV} == $(command git describe --tags --exact-match 2>/dev/null) ]]; then if [[ ${REV} == $(command git describe --tags --exact-match 2>/dev/null) ]]; then
(( PRINTLEVEL > 0 )) && print -PR ${CLEAR_LINE}"<%= okay %>%B${MODULE}:%b Already up to date" if (( PRINTLEVEL > 0 )) print -PR ${CLEAR_LINE}"<%= okay %>%B${MODULE}:%b Already up to date"
return 0 return 0
fi fi
fi fi
@ -51,7 +51,7 @@ else
fi fi
if ERR=$(command git submodule update --init --recursive -q 2>&1); then if ERR=$(command git submodule update --init --recursive -q 2>&1); then
if (( PRINTLEVEL > 0 )); then if (( PRINTLEVEL > 0 )); then
[[ -n ${LOG} ]] && OUT=${OUT}$'\n'${(F):- ${(f)^LOG}} if [[ -n ${LOG} ]] OUT=${OUT}$'\n'${(F):- ${(f)^LOG}}
print -PR ${CLEAR_LINE}"<%= okay %>%B${MODULE}:%b ${OUT}" print -PR ${CLEAR_LINE}"<%= okay %>%B${MODULE}:%b ${OUT}"
fi fi
else else

2
src/zimfw.zsh.erb
View file

@ -6,7 +6,7 @@ class Zim
@home = "${ZDOTDIR:-${HOME}}" @home = "${ZDOTDIR:-${HOME}}"
@min_zsh_version = "5.2" @min_zsh_version = "5.2"
@startup_files_glob = ".z(shenv|profile|shrc|login|logout)" @startup_files_glob = ".z(shenv|profile|shrc|login|logout)"
@version = "1.1.1" @version = "1.2.0-SNAPSHOT"
@ellipsis = " ..." @ellipsis = " ..."
@okay = "%F{green})%f " @okay = "%F{green})%f "
@error = "x " @error = "x "

42
zimfw.zsh
View file

@ -33,9 +33,7 @@ fi
: ${ZIM_HOME=${0:A:h}} : ${ZIM_HOME=${0:A:h}}
_zimfw_print() { _zimfw_print() {
if (( _zprintlevel > 0 )); then if (( _zprintlevel > 0 )) print "${@}"
print "${@}"
fi
} }
_zimfw_mv() { _zimfw_mv() {
@ -58,8 +56,8 @@ _zimfw_build_init() {
fi fi
_zimfw_mv =( _zimfw_mv =(
print -R "zimfw() { source ${ZIM_HOME}/zimfw.zsh \"\${@}\" }" print -R "zimfw() { source ${ZIM_HOME}/zimfw.zsh \"\${@}\" }"
(( ${#_zfpaths} )) && print -R 'fpath=('${_zfpaths:A}' ${fpath})' if (( ${#_zfpaths} )) print -R 'fpath=('${_zfpaths:A}' ${fpath})'
(( ${#_zfunctions} )) && print -R 'autoload -Uz '${_zfunctions} if (( ${#_zfunctions} )) print -R 'autoload -Uz '${_zfunctions}
print -Rn ${(F):-source ${^_zscripts:A}} print -Rn ${(F):-source ${^_zscripts:A}}
) ${ztarget} ) ${ztarget}
} }
@ -175,7 +173,7 @@ Startup options:
-f|--fpath) -f|--fpath)
shift shift
zarg=${1} zarg=${1}
[[ ${zarg} != /* ]] && zarg=${zdir}/${zarg} if [[ ${zarg} != /* ]] zarg=${zdir}/${zarg}
zfpaths+=(${zarg}) zfpaths+=(${zarg})
;; ;;
-a|--autoload) -a|--autoload)
@ -185,7 +183,7 @@ Startup options:
-s|--source) -s|--source)
shift shift
zarg=${1} zarg=${1}
[[ ${zarg} != /* ]] && zarg=${zdir}/${zarg} if [[ ${zarg} != /* ]] zarg=${zdir}/${zarg}
zscripts+=(${zarg}) zscripts+=(${zarg})
;; ;;
-d|--disabled) zdisabled=1 ;; -d|--disabled) zdisabled=1 ;;
@ -210,7 +208,7 @@ Startup options:
_zfailed=1 _zfailed=1
return 1 return 1
fi fi
(( ! ${#zfpaths} )) && zfpaths+=(${zdir}/functions(NF)) if (( ! ${#zfpaths} )) zfpaths+=(${zdir}/functions(NF))
if (( ! ${#zfunctions} )); then if (( ! ${#zfunctions} )); then
# _* functions are autoloaded by compinit # _* functions are autoloaded by compinit
# prompt_*_setup functions are autoloaded by promptinit # prompt_*_setup functions are autoloaded by promptinit
@ -262,7 +260,7 @@ _zimfw_version_check() {
_zimfw_clean_compiled() { _zimfw_clean_compiled() {
local zopt local zopt
(( _zprintlevel > 0 )) && zopt='-v' if (( _zprintlevel > 0 )) zopt='-v'
command rm -f ${zopt} ${ZIM_HOME}/**/*.zwc(|.old) || return 1 command rm -f ${zopt} ${ZIM_HOME}/**/*.zwc(|.old) || return 1
command rm -f ${zopt} ${ZDOTDIR:-${HOME}}/.z(shenv|profile|shrc|login|logout).zwc(|.old)(N) || return 1 command rm -f ${zopt} ${ZDOTDIR:-${HOME}}/.z(shenv|profile|shrc|login|logout).zwc(|.old)(N) || return 1
_zimfw_print -P 'Done with clean-compiled. Run %Bzimfw compile%b to re-compile.' _zimfw_print -P 'Done with clean-compiled. Run %Bzimfw compile%b to re-compile.'
@ -271,19 +269,19 @@ _zimfw_clean_compiled() {
_zimfw_clean_dumpfile() { _zimfw_clean_dumpfile() {
local zdumpfile zopt local zdumpfile zopt
zstyle -s ':zim:completion' dumpfile 'zdumpfile' || zdumpfile=${ZDOTDIR:-${HOME}}/.zcompdump zstyle -s ':zim:completion' dumpfile 'zdumpfile' || zdumpfile=${ZDOTDIR:-${HOME}}/.zcompdump
(( _zprintlevel > 0 )) && zopt='-v' if (( _zprintlevel > 0 )) zopt='-v'
command rm -f ${zopt} ${zdumpfile}(|.zwc(|.old))(N) || return 1 command rm -f ${zopt} ${zdumpfile}(|.zwc(|.old))(N) || return 1
_zimfw_print -P 'Done with clean-dumpfile. Restart your terminal to dump an updated configuration.' _zimfw_print -P 'Done with clean-dumpfile. Restart your terminal to dump an updated configuration.'
} }
_zimfw_compile() { _zimfw_compile() {
local zopt local zopt
(( _zprintlevel <= 0 )) && zopt='-q' if (( _zprintlevel <= 0 )) zopt='-q'
source ${ZIM_HOME}/login_init.zsh ${zopt} source ${ZIM_HOME}/login_init.zsh ${zopt}
} }
_zimfw_info() { _zimfw_info() {
print -R 'zimfw version: '${_zversion}' (previous commit is 6129062)' print -R 'zimfw version: '${_zversion}' (previous commit is 13fb1ea)'
print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'ZIM_HOME: '${ZIM_HOME}
print -R 'Zsh version: '${ZSH_VERSION} print -R 'Zsh version: '${ZSH_VERSION}
print -R 'System info: '$(command uname -a) print -R 'System info: '$(command uname -a)
@ -291,7 +289,7 @@ _zimfw_info() {
_zimfw_uninstall() { _zimfw_uninstall() {
local zopt zdir zmodule local zopt zdir zmodule
(( _zprintlevel > 0 )) && zopt='-v' if (( _zprintlevel > 0 )) zopt='-v'
for zdir in ${ZIM_HOME}/modules/*(N/); do for zdir in ${ZIM_HOME}/modules/*(N/); do
zmodule=${zdir:t} zmodule=${zdir:t}
# If _zmodules and _zdisableds do not contain the zmodule # If _zmodules and _zdisableds do not contain the zmodule
@ -311,9 +309,9 @@ _zimfw_upgrade() {
command curl -fsSL ${zurl} | command gunzip > ${ztarget}.new || return 1 command curl -fsSL ${zurl} | command gunzip > ${ztarget}.new || return 1
else else
local zopt local zopt
(( _zprintlevel <= 1 )) && zopt='-q' if (( _zprintlevel <= 1 )) zopt='-q'
if ! command wget -nv ${zopt} -O - ${zurl} | command gunzip > ${ztarget}.new; then if ! command wget -nv ${zopt} -O - ${zurl} | command gunzip > ${ztarget}.new; then
(( _zprintlevel <= 1 )) && print -u2 -PR "%F{red}x Error downloading %B${zurl}%b. Use %B-v%b option to see details.%f" if (( _zprintlevel <= 1 )) print -u2 -PR "%F{red}x Error downloading %B${zurl}%b. Use %B-v%b option to see details.%f"
return 1 return 1
fi fi
fi fi
@ -327,7 +325,7 @@ _zimfw_upgrade() {
} }
zimfw() { zimfw() {
local -r _zversion='1.1.1' local -r _zversion='1.2.0-SNAPSHOT'
local -r zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b] local -r zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b]
Actions: Actions:
@ -382,11 +380,9 @@ if [[ -e \${DIR} ]]; then
# Already exists # Already exists
return 0 return 0
fi fi
(( PRINTLEVEL > 0 )) && print -Rn \${CLEAR_LINE}\"Installing \${MODULE} ...\" if (( PRINTLEVEL > 0 )) print -Rn \${CLEAR_LINE}\"Installing \${MODULE} ...\"
if ERR=\$(command git clone -b \${REV} -q --recursive \${URL} \${DIR} 2>&1); then if ERR=\$(command git clone -b \${REV} -q --recursive \${URL} \${DIR} 2>&1); then
if (( PRINTLEVEL > 0 )); then if (( PRINTLEVEL > 0 )) print -PR \${CLEAR_LINE}\"%F{green})%f %B\${MODULE}:%b Installed\"
print -PR \${CLEAR_LINE}\"%F{green})%f %B\${MODULE}:%b Installed\"
fi
else else
print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b Error during git clone%f\"$'\n'\${(F):- \${(f)^ERR}} print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b Error during git clone%f\"$'\n'\${(F):- \${(f)^ERR}}
return 1 return 1
@ -402,7 +398,7 @@ readonly TYPE=\${4}
readonly REV=\${5} readonly REV=\${5}
readonly -i PRINTLEVEL=\${6} readonly -i PRINTLEVEL=\${6}
readonly CLEAR_LINE=$'\E[2K\r' readonly CLEAR_LINE=$'\E[2K\r'
(( PRINTLEVEL > 0 )) && print -Rn \${CLEAR_LINE}\"Updating \${MODULE} ...\" if (( PRINTLEVEL > 0 )) print -Rn \${CLEAR_LINE}\"Updating \${MODULE} ...\"
if ! builtin cd -q \${DIR} 2>/dev/null; then if ! builtin cd -q \${DIR} 2>/dev/null; then
print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b Not installed%f\" print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b Not installed%f\"
return 1 return 1
@ -417,7 +413,7 @@ if [[ \${URL} != \$(command git config --get remote.origin.url) ]]; then
fi fi
if [[ \${TYPE} == tag ]]; then if [[ \${TYPE} == tag ]]; then
if [[ \${REV} == \$(command git describe --tags --exact-match 2>/dev/null) ]]; then if [[ \${REV} == \$(command git describe --tags --exact-match 2>/dev/null) ]]; then
(( PRINTLEVEL > 0 )) && print -PR \${CLEAR_LINE}\"%F{green})%f %B\${MODULE}:%b Already up to date\" if (( PRINTLEVEL > 0 )) print -PR \${CLEAR_LINE}\"%F{green})%f %B\${MODULE}:%b Already up to date\"
return 0 return 0
fi fi
fi fi
@ -447,7 +443,7 @@ else
fi fi
if ERR=\$(command git submodule update --init --recursive -q 2>&1); then if ERR=\$(command git submodule update --init --recursive -q 2>&1); then
if (( PRINTLEVEL > 0 )); then if (( PRINTLEVEL > 0 )); then
[[ -n \${LOG} ]] && OUT=\${OUT}$'\n'\${(F):- \${(f)^LOG}} if [[ -n \${LOG} ]] OUT=\${OUT}$'\n'\${(F):- \${(f)^LOG}}
print -PR \${CLEAR_LINE}\"%F{green})%f %B\${MODULE}:%b \${OUT}\" print -PR \${CLEAR_LINE}\"%F{green})%f %B\${MODULE}:%b \${OUT}\"
fi fi
else else