Skip to content

Commit ab176c6

Browse files
committed
selfupdate is broken #174 : switch to releases strategy
1 parent 01b1518 commit ab176c6

3 files changed

Lines changed: 19 additions & 22 deletions

File tree

makesure

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -493,18 +493,17 @@ function currentTimeMillis(res){
493493
res=executeGetLine("date +%s%3N")
494494
sub(/%?3N/,"000",res)
495495
return +res}
496-
function selfUpdate(tmp,err,newVer,line,sha){
496+
function selfUpdate(tmp,err,newVer,line,ver){
497497
tmp=executeGetLine("mktemp /tmp/makesure_new.XXXXXXXXXX")
498-
err=dl("https://api.github.com/repos/xonixx/makesure/commits?per_page=1",tmp)
498+
err=dl("https://github.com/xonixx/makesure/releases",tmp)
499499
if(!err){
500500
while(getline line<tmp){
501-
if(line~/"sha":/){
502-
if(match(line=substr(line,index(line,"\"sha\":")+6),/"[a-z0-9]+"/))
503-
sha=substr(line,RSTART+1,RLENGTH-2)
501+
if(match(line,/\/xonixx\/makesure\/releases\/tag\/v[0-9.]+/)){
502+
ver=substr(line=substr(line,RSTART,RLENGTH),index(line,"/v")+1)
504503
break}}
505-
if(!sha)err="unable to get the latest commit"
504+
if(!ver)err="unable to get the latest release"
506505
if(!err){
507-
err=dl("https://raw.githubusercontent.com/xonixx/makesure/"sha"/makesure",tmp)
506+
err=dl("https://raw.githubusercontent.com/xonixx/makesure/"ver"/makesure",tmp)
508507
if(!err&&!ok("chmod +x "tmp))err="can'\''t chmod +x "tmp
509508
if(!err){
510509
newVer=executeGetLine(tmp" -v")

makesure.awk

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -720,22 +720,21 @@ function currentTimeMillis( res) {
720720
return +res
721721
}
722722

723-
function selfUpdate( tmp, err, newVer,line,sha) {
723+
function selfUpdate( tmp, err, newVer,line,ver) {
724724
tmp = executeGetLine("mktemp /tmp/makesure_new.XXXXXXXXXX")
725-
# first get the last commit hash
726-
err = dl("https://api.github.com/repos/xonixx/makesure/commits?per_page=1", tmp)
725+
# first get the last release version
726+
err = dl("https://github.com/xonixx/makesure/releases", tmp)
727727
if (!err) {
728728
while (getline line < tmp) {
729-
if (line ~ /"sha":/) {
730-
if (match(line = substr(line, index(line, "\"sha\":") + 6), /"[a-z0-9]+"/))
731-
sha = substr(line, RSTART + 1, RLENGTH - 2)
729+
if (match(line, /\/xonixx\/makesure\/releases\/tag\/v[0-9.]+/)) {
730+
ver = substr(line = substr(line, RSTART, RLENGTH), index(line, "/v") + 1) # v0.9.23
732731
break
733732
}
734733
}
735-
if (!sha) err = "unable to get the latest commit"
734+
if (!ver) err = "unable to get the latest release"
736735
if (!err) {
737736
# now download the latest executable
738-
err = dl("https://raw.githubusercontent.com/xonixx/makesure/" sha "/makesure", tmp)
737+
err = dl("https://raw.githubusercontent.com/xonixx/makesure/" ver "/makesure", tmp)
739738
if (!err && !ok("chmod +x " tmp)) err = "can't chmod +x " tmp
740739
if (!err) {
741740
newVer = executeGetLine(tmp " -v")

makesure_candidate

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -493,18 +493,17 @@ function currentTimeMillis(res){
493493
res=executeGetLine("date +%s%3N")
494494
sub(/%?3N/,"000",res)
495495
return +res}
496-
function selfUpdate(tmp,err,newVer,line,sha){
496+
function selfUpdate(tmp,err,newVer,line,ver){
497497
tmp=executeGetLine("mktemp /tmp/makesure_new.XXXXXXXXXX")
498-
err=dl("https://api.github.com/repos/xonixx/makesure/commits?per_page=1",tmp)
498+
err=dl("https://github.com/xonixx/makesure/releases",tmp)
499499
if(!err){
500500
while(getline line<tmp){
501-
if(line~/"sha":/){
502-
if(match(line=substr(line,index(line,"\"sha\":")+6),/"[a-z0-9]+"/))
503-
sha=substr(line,RSTART+1,RLENGTH-2)
501+
if(match(line,/\/xonixx\/makesure\/releases\/tag\/v[0-9.]+/)){
502+
ver=substr(line=substr(line,RSTART,RLENGTH),index(line,"/v")+1)
504503
break}}
505-
if(!sha)err="unable to get the latest commit"
504+
if(!ver)err="unable to get the latest release"
506505
if(!err){
507-
err=dl("https://raw.githubusercontent.com/xonixx/makesure/"sha"/makesure",tmp)
506+
err=dl("https://raw.githubusercontent.com/xonixx/makesure/"ver"/makesure",tmp)
508507
if(!err&&!ok("chmod +x "tmp))err="can'\''t chmod +x "tmp
509508
if(!err){
510509
newVer=executeGetLine(tmp" -v")

0 commit comments

Comments
 (0)