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

Use Zsh scripting instead of sed, sort and tail

Browse source 
`foo | sed 's?^.*/v??' | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -n1` is
the same as `${${(On)${(f)"$(foo)"}##*v}[1]}`. We don't want to depend
on external tools that might not be available in all platforms.
This commit is contained in:
Eric Nielsen 2021-03-19 18:14:31 -05:00
parent 65783e61ed
commit 163d36b61b
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/stage2/40_zimfw_version_check.zsh.erb
View file

@ -4,9 +4,9 @@ _zimfw_version_check() {
local -r ztarget=${ZIM_HOME}/.latest_version local -r ztarget=${ZIM_HOME}/.latest_version
# If .latest_version does not exist or was not modified in the last 30 days # If .latest_version does not exist or was not modified in the last 30 days
if [[ -w ${ztarget:h} && ! -f ${ztarget}(#qNm-30) ]]; then if [[ -w ${ztarget:h} && ! -f ${ztarget}(#qNm-30) ]]; then
command git ls-remote --tags --refs https://github.com/zimfw/zimfw.git 'v*' | \ # Get latest version (get all `v*` tags from repo, delete `*v` from beginning, sort in descending `O`rder
command sed 's?^.*/v??' | command sort -n -t. -k1,1 -k2,2 -k3,3 | \ # `n`umerically, and get the `[1]` first)
command tail -n1 >! ${ztarget} &! print ${${(On)${(f)"$(command git ls-remote --tags --refs https://github.com/zimfw/zimfw.git 'v*')"}##*v}[1]} >! ${ztarget} &!
fi fi
if [[ -f ${ztarget} ]]; then if [[ -f ${ztarget} ]]; then
local -r zlatest_version=$(<${ztarget}) local -r zlatest_version=$(<${ztarget})

8
zimfw.zsh
View file

@ -290,9 +290,9 @@ _zimfw_version_check() {
local -r ztarget=${ZIM_HOME}/.latest_version local -r ztarget=${ZIM_HOME}/.latest_version
# If .latest_version does not exist or was not modified in the last 30 days # If .latest_version does not exist or was not modified in the last 30 days
if [[ -w ${ztarget:h} && ! -f ${ztarget}(#qNm-30) ]]; then if [[ -w ${ztarget:h} && ! -f ${ztarget}(#qNm-30) ]]; then
command git ls-remote --tags --refs https://github.com/zimfw/zimfw.git 'v*' | \ # Get latest version (get all `v*` tags from repo, delete `*v` from beginning, sort in descending `O`rder
command sed 's?^.*/v??' | command sort -n -t. -k1,1 -k2,2 -k3,3 | \ # `n`umerically, and get the `[1]` first)
command tail -n1 >! ${ztarget} &! print ${${(On)${(f)"$(command git ls-remote --tags --refs https://github.com/zimfw/zimfw.git 'v*')"}##*v}[1]} >! ${ztarget} &!
fi fi
if [[ -f ${ztarget} ]]; then if [[ -f ${ztarget} ]]; then
local -r zlatest_version=$(<${ztarget}) local -r zlatest_version=$(<${ztarget})
@ -328,7 +328,7 @@ _zimfw_compile() {
} }
_zimfw_info() { _zimfw_info() {
print -R 'zimfw version: '${_zversion}' (built at 2021-03-19 22:13:04 UTC, previous commit is f7c0bbe)' print -R 'zimfw version: '${_zversion}' (built at 2021-03-19 23:11:36 UTC, previous commit is 65783e6)'
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)