[elpa] master a179572 3/4: [admin] Specify bash in update-archive.sh shebang line.
branch: master commit a1795726dd7ef49265f55794a80fb457c7976e98 Author: Thien-Thi Nguyen Commit: Thien-Thi Nguyen [admin] Specify bash in update-archive.sh shebang line. The program uses several bash-specific constructs. Although in all likelihood any place where this is used will have sh aliased to bash anyway, it's better to be explicit to avoid latent bugs. * admin/update-archive.sh: Specify "/bin/bash" in shebang line. --- admin/update-archive.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/admin/update-archive.sh b/admin/update-archive.sh index 28cd99d..1986677 100755 --- a/admin/update-archive.sh +++ b/admin/update-archive.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# TODO: (line 1) s/sh/bash/ +#!/bin/bash # TODO: Author # TODO: License ##
[elpa] master 951053f 2/4: [admin] Make update-archive.sh slightly less verbose.
branch: master
commit 951053faeed2bbc1db9f187c09f732b38f4e138c
Author: Thien-Thi Nguyen
Commit: Thien-Thi Nguyen
[admin] Make update-archive.sh slightly less verbose.
* admin/update-archive.sh: Move the ‘-x’ flag from shebang
line to explicit ‘set -x’ following options/args processing.
---
admin/update-archive.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index 52e9adf..28cd99d 100755
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -1,6 +1,5 @@
-#!/bin/sh -x
+#!/bin/sh
# TODO: (line 1) s/sh/bash/
-# TODO: (line 1) Rework ‘-x’ to ‘set -x’ following hv/arg checks.
# TODO: Author
# TODO: License
##
@@ -89,6 +88,8 @@ test -L $0 || { hv=`dirname $0`/hv.sh ; test -r $hv && . $hv
; }
# TODO: (here) Validate args.
+set -x
+
makelog=""
buildir="$(pwd)"
[elpa] master updated (dae475f -> 78e3869)
ttn pushed a change to branch master. from dae475f Merge commit '8e63abd47ea0cfa00b44b3c2ab81a933dbd9ce93' new deb5eb7 [admin] Fix bug: Clean up $buildir/archive when done. new 951053f [admin] Make update-archive.sh slightly less verbose. new a179572 [admin] Specify bash in update-archive.sh shebang line. new 78e3869 [admin] Bump update-archive.sh version to "1.7" for push. Summary of changes: admin/update-archive.sh | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-)
[elpa] master 78e3869 4/4: [admin] Bump update-archive.sh version to "1.7" for push.
branch: master
commit 78e3869ba1bea14c5619e786a79f5e5309b43d88
Author: Thien-Thi Nguyen
Commit: Thien-Thi Nguyen
[admin] Bump update-archive.sh version to "1.7" for push.
* admin/update-archive.sh (version): Bump to "1.7".
---
admin/update-archive.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/admin/update-archive.sh b/admin/update-archive.sh
index 1986677..82ff56a 100755
--- a/admin/update-archive.sh
+++ b/admin/update-archive.sh
@@ -80,7 +80,8 @@
#1.4 -- use sendmail(8) and rsync(1)
#1.5 -- make staging operations less brittle
#1.6 -- support ‘--help’, ‘--version’
-version='1.6'
+#1.7 -- fix DANGEROUS bug; make less noisy; name bash explicitly
+version='1.7'
# If $0 is a symlink, `dirname $0`/hv.sh might not be available,
# and even if it IS available, how can we be sure it's bonafide?
test -L $0 || { hv=`dirname $0`/hv.sh ; test -r $hv && . $hv ; }
[elpa] master deb5eb7 1/4: [admin] Fix bug: Clean up $buildir/archive when done.
branch: master commit deb5eb7cb2277f602249f322043ee4c7702c1bd9 Author: Thien-Thi Nguyen Commit: Thien-Thi Nguyen [admin] Fix bug: Clean up $buildir/archive when done. This was supposed to happen, but the bug manifested as a typo: "buildid" instead of "buildir" -- note trailing "d" -- resulting in a command "rm -rf /archive". Yikes! * admin/update-archive.sh : Spell ‘buildir’ correctly. --- admin/update-archive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/update-archive.sh b/admin/update-archive.sh index 42d806a..52e9adf 100755 --- a/admin/update-archive.sh +++ b/admin/update-archive.sh @@ -209,7 +209,7 @@ latest="emacs-packages-latest.tgz" esac done mv $buildir/archive/"$latest" staging/ - rm -rf $buildid/archive) ;# FIXME: TYPO (UNDETECTED, DANGEROUS!) + rm -rf $buildir/archive) # Make the HTML and readme.txt files. (cd ../staging/packages
[elpa] master bef56eb 3/3: [admin] Release: org-synch.sh 1.2.
branch: master
commit bef56eb090f193e18aac04976c6c82ac084be157
Author: Thien-Thi Nguyen
Commit: Thien-Thi Nguyen
[admin] Release: org-synch.sh 1.2.
* admin/org-synch.sh (version): Bump to "1.2".
---
admin/org-synch.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/admin/org-synch.sh b/admin/org-synch.sh
index 130c2c8..6ca8880 100755
--- a/admin/org-synch.sh
+++ b/admin/org-synch.sh
@@ -20,7 +20,8 @@
#0.x -- release from the previous VCS
#1.0 -- initial release from this VCS (Git)
#1.1 -- support ‘--help’, ‘--version’
-version='1.1'
+#1.2 -- no longer require curl; performance tweak
+version='1.2'
# If $0 is a symlink, `dirname $0`/hv.sh might not be available,
# and even if it IS available, how can we be sure it's bonafide?
test -L $0 || { hv=`dirname $0`/hv.sh ; test -r $hv && . $hv ; }
[elpa] master 4ef7d17 1/3: [admin] Prefer GNU wget to curl.
branch: master
commit 4ef7d17dbf42a4278455b7f0403039ccf7851526
Author: Thien-Thi Nguyen
Commit: Thien-Thi Nguyen
[admin] Prefer GNU wget to curl.
Since we're already using wget in the program, anyway...
* admin/org-synch.sh (pkgname): Use wget instead of curl.
---
admin/org-synch.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/org-synch.sh b/admin/org-synch.sh
index 46143ea..1bac8d7 100755
--- a/admin/org-synch.sh
+++ b/admin/org-synch.sh
@@ -11,7 +11,7 @@
# ADMIN-DIR/org-sync.el (func ‘org-sync’) to finish the job.
#
# Preconditions:
-# - Installed software: curl, perl, wget, emacs.
+# - Installed software: perl, wget, emacs.
# - Internet connection (i.e., can access orgmode.org over HTTP).
# - DOWNLOAD-DIR exists and rw.
# - ADMIN-DIR exists and readable.
@@ -29,7 +29,7 @@ test -L $0 || { hv=`dirname $0`/hv.sh ; test -r $hv && . $hv
; }
PATH="/bin:/usr/bin:/usr/local/bin:${PATH}"
-pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $1 if
m/(org-\d{8}\.tar)/; END { @f = sort @f; print "$f[-1]\n"}'`
+pkgname=`wget -q http://orgmode.org/elpa/ -O-|perl -ne 'push @f, $1 if
m/(org-\d{8}\.tar)/; END { @f = sort @f; print "$f[-1]\n"}'`
cd $1
wget -q http://orgmode.org/elpa/${pkgname} -O ${pkgname}-tmp
[elpa] master updated (78e3869 -> bef56eb)
ttn pushed a change to branch master. from 78e3869 [admin] Bump update-archive.sh version to "1.7" for push. new 4ef7d17 [admin] Prefer GNU wget to curl. new 25d7c19 [admin int] Simplify perl script. new bef56eb [admin] Release: org-synch.sh 1.2. Summary of changes: admin/org-synch.sh | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
[elpa] master 25d7c19 2/3: [admin int] Simplify perl script.
branch: master
commit 25d7c19ad278d39b26940f0dfaaacb2c05d8b94b
Author: Thien-Thi Nguyen
Commit: Thien-Thi Nguyen
[admin int] Simplify perl script.
* admin/org-synch.sh (pkgname) [perl script]:
Eliminate sorting pass; don't bother w/ newline in output.
---
admin/org-synch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/admin/org-synch.sh b/admin/org-synch.sh
index 1bac8d7..130c2c8 100755
--- a/admin/org-synch.sh
+++ b/admin/org-synch.sh
@@ -29,7 +29,7 @@ test -L $0 || { hv=`dirname $0`/hv.sh ; test -r $hv && . $hv
; }
PATH="/bin:/usr/bin:/usr/local/bin:${PATH}"
-pkgname=`wget -q http://orgmode.org/elpa/ -O-|perl -ne 'push @f, $1 if
m/(org-\d{8}\.tar)/; END { @f = sort @f; print "$f[-1]\n"}'`
+pkgname=`wget -q http://orgmode.org/elpa/ -O-|perl -ne '$n = $1 if
(m/(org-\d{8}\.tar)/ && $1 gt $n); END { print "$n" }'`
cd $1
wget -q http://orgmode.org/elpa/${pkgname} -O ${pkgname}-tmp
