psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-12-03 04:25:34 -05:00
Code Issues Releases Wiki Activity

Set default ztype in update.zsh.erb

Browse source 
since we're already setting the default zrev in there too. Leave both
blank in zmodule if they're not set by the user.
This commit is contained in:
Eric Nielsen 2021-01-04 21:20:03 -05:00
parent ac701799d0
commit bcae8c0a06
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ Initialization options:
fi fi
setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB
local zmodule=${1:t} zurl=${1} local zmodule=${1:t} zurl=${1}
local ztype=branch zrev local ztype zrev
local -i zdisabled=0 zfrozen=0 local -i zdisabled=0 zfrozen=0
local -a zfpaths zfunctions zcmds local -a zfpaths zfunctions zcmds
local zarg zdir local zarg zdir
@ -121,7 +121,7 @@ Initialization options:
done done
if (( _zprepare_zargs )); then if (( _zprepare_zargs )); then
if (( ! zfrozen )); then if (( ! zfrozen )); then
_zmodules_zargs+=(${zmodule} ${zdir} ${zurl} ${ztype} "${zrev}" ${_zprintlevel}) _zmodules_zargs+=(${zmodule} ${zdir} ${zurl} "${ztype}" "${zrev}" ${_zprintlevel})
fi fi
else else
if (( zdisabled )); then if (( zdisabled )); then

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

@ -2,7 +2,7 @@
readonly MODULE=${1} readonly MODULE=${1}
readonly DIR=${2} readonly DIR=${2}
readonly URL=${3} readonly URL=${3}
readonly TYPE=${4} readonly TYPE=${4:=branch}
readonly REV=${5:=HEAD} readonly REV=${5:=HEAD}
readonly -i PRINTLEVEL=${6} readonly -i PRINTLEVEL=${6}
readonly CLEAR_LINE=$'\E[2K\r' readonly CLEAR_LINE=$'\E[2K\r'

10
zimfw.zsh
View file

@ -4,7 +4,7 @@
# MIT License # MIT License
# #
# Copyright (c) 2015-2016 Matt Hamilton and contributors # Copyright (c) 2015-2016 Matt Hamilton and contributors
# Copyright (c) 2016-2020 Eric Nielsen, Matt Hamilton and contributors # Copyright (c) 2016-2021 Eric Nielsen, Matt Hamilton and contributors
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # of this software and associated documentation files (the "Software"), to deal
@ -146,7 +146,7 @@ Initialization options:
fi fi
setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB setopt LOCAL_OPTIONS CASE_GLOB EXTENDED_GLOB
local zmodule=${1:t} zurl=${1} local zmodule=${1:t} zurl=${1}
local ztype=branch zrev local ztype zrev
local -i zdisabled=0 zfrozen=0 local -i zdisabled=0 zfrozen=0
local -a zfpaths zfunctions zcmds local -a zfpaths zfunctions zcmds
local zarg zdir local zarg zdir
@ -228,7 +228,7 @@ Initialization options:
done done
if (( _zprepare_zargs )); then if (( _zprepare_zargs )); then
if (( ! zfrozen )); then if (( ! zfrozen )); then
_zmodules_zargs+=(${zmodule} ${zdir} ${zurl} ${ztype} "${zrev}" ${_zprintlevel}) _zmodules_zargs+=(${zmodule} ${zdir} ${zurl} "${ztype}" "${zrev}" ${_zprintlevel})
fi fi
else else
if (( zdisabled )); then if (( zdisabled )); then
@ -319,7 +319,7 @@ _zimfw_compile() {
} }
_zimfw_info() { _zimfw_info() {
print -R 'zimfw version: '${_zversion}' (built at 2021-01-02 23:47:25 UTC, previous commit is 153c547)' print -R 'zimfw version: '${_zversion}' (built at 2021-01-04 20:46:42 UTC, previous commit is 3567694)'
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)
@ -435,7 +435,7 @@ fi
readonly MODULE=\${1} readonly MODULE=\${1}
readonly DIR=\${2} readonly DIR=\${2}
readonly URL=\${3} readonly URL=\${3}
readonly TYPE=\${4} readonly TYPE=\${4:=branch}
readonly REV=\${5:=HEAD} readonly REV=\${5:=HEAD}
readonly -i PRINTLEVEL=\${6} readonly -i PRINTLEVEL=\${6}
readonly CLEAR_LINE=$'\E[2K\r' readonly CLEAR_LINE=$'\E[2K\r'