psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-26 09:15:34 -05:00
Code Issues Releases Wiki Activity

Swap curl and wget

Browse source 
Fixes #360
This commit is contained in:
Eric Nielsen 2020-01-11 16:35:59 -05:00
parent ee99fe8a36
commit 65d7f6d3d0
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,9 @@ _zimfw_upgrade() {
local -r ztarget=${ZIM_HOME}/zimfw.zsh local -r ztarget=${ZIM_HOME}/zimfw.zsh
local -r zurl=https://raw.githubusercontent.com/zimfw/zimfw/master/zimfw.zsh local -r zurl=https://raw.githubusercontent.com/zimfw/zimfw/master/zimfw.zsh
{ {
if (( ${+commands[wget]} )); then if (( ${+commands[curl]} )); then
command curl -fsSL -o ${ztarget}.new ${zurl} || return 1
else
local zopt local zopt
(( _zprintlevel <= 1 )) && zopt='-q' (( _zprintlevel <= 1 )) && zopt='-q'
if ! command wget -nv ${zopt} -O ${ztarget}.new ${zurl}; then if ! command wget -nv ${zopt} -O ${ztarget}.new ${zurl}; then
@ -10,7 +12,6 @@ _zimfw_upgrade() {
return 1 return 1
fi fi
else else
command curl -fsSL -o ${ztarget}.new ${zurl} || return 1
fi fi
_zimfw_mv ${ztarget}{.new,} && _zimfw_print -P '<%= done %>Done with upgrade.' _zimfw_mv ${ztarget}{.new,} && _zimfw_print -P '<%= done %>Done with upgrade.'
} always { } always {

7
zimfw.zsh
View file

@ -260,7 +260,7 @@ _zimfw_compile() {
} }
_zimfw_info() { _zimfw_info() {
print 'Zim version: 1.1.0-SNAPSHOT (previous commit is b9bca2d)' print 'Zim version: 1.1.0-SNAPSHOT (previous commit is ee99fe8)'
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)
@ -283,7 +283,9 @@ _zimfw_upgrade() {
local -r ztarget=${ZIM_HOME}/zimfw.zsh local -r ztarget=${ZIM_HOME}/zimfw.zsh
local -r zurl=https://raw.githubusercontent.com/zimfw/zimfw/master/zimfw.zsh local -r zurl=https://raw.githubusercontent.com/zimfw/zimfw/master/zimfw.zsh
{ {
if (( ${+commands[wget]} )); then if (( ${+commands[curl]} )); then
command curl -fsSL -o ${ztarget}.new ${zurl} || return 1
else
local zopt local zopt
(( _zprintlevel <= 1 )) && zopt='-q' (( _zprintlevel <= 1 )) && zopt='-q'
if ! command wget -nv ${zopt} -O ${ztarget}.new ${zurl}; then if ! command wget -nv ${zopt} -O ${ztarget}.new ${zurl}; then
@ -291,7 +293,6 @@ _zimfw_upgrade() {
return 1 return 1
fi fi
else else
command curl -fsSL -o ${ztarget}.new ${zurl} || return 1
fi fi
_zimfw_mv ${ztarget}{.new,} && _zimfw_print -P 'Done with upgrade.' _zimfw_mv ${ztarget}{.new,} && _zimfw_print -P 'Done with upgrade.'
} always { } always {