From ffc14e64ea5d929327dcd5f709453bcd31cde5fd Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Sat, 20 Jul 2013 16:42:02 +0200 Subject: [PATCH] 10seconds_install: Better support for Polarhome platforms. Accept future signing keyid. --- 10seconds_install | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/10seconds_install b/10seconds_install index e67badb1..7be84658 100644 --- a/10seconds_install +++ b/10seconds_install @@ -14,7 +14,12 @@ # If that fails, it does a personal installation. # If that fails, it copies to $HOME/bin -LATEST=$(wget -qO- http://ftpmirror.gnu.org/parallel | perl -ne '/(parallel-\d{8})/ and print $1."\n"' | sort | tail -n1) +# tail on openindiana must be /usr/xpg4/bin/tail +TAIL=$(echo | tail -n 1 2>/dev/null && echo tail || (echo | /usr/xpg4/bin/tail -n 1 && echo /usr/xpg4/bin/tail)) +# grep on openindiana must be /usr/xpg4/bin/grep +GREP=$(echo | grep -vE . 2>/dev/null && echo grep || (echo | /usr/xpg4/bin/grep -vE . && echo /usr/xpg4/bin/grep)) + +LATEST=$(wget -qO- http://ftpmirror.gnu.org/parallel | perl -ne '/(parallel-\d{8})/ and print $1."\n"' | sort | $TAIL -n1) if test \! -d $LATEST/src/; then # Source dir does not exist rm -f $LATEST.tar.bz2 $LATEST.tar.bz2.sig @@ -27,8 +32,10 @@ if gpg -h 2>/dev/null >/dev/null; then # GnuPG installed # Setup .gnupg/gpg.conf if not already done echo | gpg 2>/dev/null >/dev/null - if gpg --with-fingerprint --auto-key-locate keyserver --keyserver-options auto-key-retrieve $LATEST.tar.bz2.sig 2>&1 | grep -E '^Primary key fingerprint: BE9C B493 81DE 3166 A3BC 66C1 2C62 29E2 FFFF FFF1' ; then - # Source code signed by Ole Tange KeyID FFFFFFF1 + gpg --keyserver keys.gnupg.net --recv-key FFFFFFF1 + gpg --keyserver keys.gnupg.net --recv-key 88888888 + if gpg --with-fingerprint $LATEST.tar.bz2.sig 2>&1 | $GREP -E '^Primary key fingerprint: BE9C B493 81DE 3166 A3BC 66C1 2C62 29E2 FFFF FFF1|^Primary key fingerprint: CDA0 1A42 08C4 F745 0610 7E7B D1AB 4516 8888 8888' ; then + # Source code signed by Ole Tange KeyID FFFFFFF1/88888888 true else # GnuPG signature failed