From 32318fca9c25c884b1d9ffb248230f477b0b7f7d Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Thu, 2 May 2019 00:58:51 +0200 Subject: [PATCH] 10seconds_install: Update copyright year. --- 10seconds_install | 30 +++++++++++++++++------------- README | 15 +++++++++++++-- src/parallel | 1 + src/parallel_tutorial.pod | 12 ++++++++++-- 4 files changed, 41 insertions(+), 17 deletions(-) diff --git a/10seconds_install b/10seconds_install index feeebed5..febfeb8f 100644 --- a/10seconds_install +++ b/10seconds_install @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2013-2018 Ole Tange and Free Software Foundation, Inc. +# Copyright (C) 2013-2019 Ole Tange and Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,12 @@ # If that fails, it copies to $HOME/bin # # You can download and run the script directly by: -# (lynx -source pi.dk/3 || wget -O - pi.dk/3 || curl pi.dk/3/ || fetch -o - http://pi.dk/3) | bash +# $ (wget -O - pi.dk/3 || lynx -source pi.dk/3 || curl pi.dk/3/ || \ +# fetch -o - http://pi.dk/3) > install.sh +# $ sha1sum install.sh +# $ md5sum install.sh +# $ sha512sum install.sh +# $ bash install.sh run() { # tail on openindiana must be /usr/xpg4/bin/tail @@ -56,11 +61,11 @@ run() { 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 + echo | gpg 2>/dev/null >/dev/null keyserver1=keys.gnupg.net keyserver2=pool.sks-keyservers.net if gpg --keyserver $keyserver1 --recv-key 0xFFFFFFF1 || - gpg --keyserver $keyserver2 --recv-key 0xFFFFFFF1 ; then + gpg --keyserver $keyserver2 --recv-key 0xFFFFFFF1 ; then if gpg --keyserver $keyserver1 --recv-key 0x88888888 || gpg --keyserver $keyserver2 --recv-key 0x88888888; then # OK @@ -70,7 +75,7 @@ run() { echo "Cannot fetch keyID 0x88888888, so the signature cannot be checked." return 1 fi - else + else echo echo "Cannot fetch keyID 0xFFFFFFF1, so the signature cannot be checked." return 1 @@ -83,18 +88,17 @@ run() { fi } - # Check signature - in case ftpmirror.gnu.org is compromised if fetch_keys; then - if gpg --with-fingerprint $LATEST.tar.bz2.sig 2>&1 | + 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 + # GnuPG signature failed echo - echo "The signature on $LATEST.tar.bz2 is wrong. This may indicate that a criminal has changed the code." + echo "The signature on $LATEST.tar.bz2 is wrong. This may indicate that a criminal has changed the code." echo "THIS IS BAD AND THE CODE WILL NOT BE INSTALLED." echo echo "See http://git.savannah.gnu.org/cgit/parallel.git/tree/README for other installation methods." @@ -122,21 +126,21 @@ run() { echo GNU $LATEST installed globally else if ./configure --prefix=$HOME && make && make install; then - echo + echo echo GNU $LATEST installed in $HOME/bin else mkdir -p $HOME/bin/; - chmod 755 src/*; + chmod 755 src/*; cp src/parallel src/env_parallel* src/sem src/sql src/niceload src/parcat $HOME/bin; echo - echo GNU $LATEST copied to $HOME/bin + echo GNU $LATEST copied to $HOME/bin fi # Is $HOME/bin already in $PATH? if echo $PATH | grep $HOME/bin >/dev/null; then # $HOME/bin is already in $PATH true - else + else # Add $HOME/bin to $PATH for both bash and csh echo 'PATH=$PATH:$HOME/bin' >> $HOME/.bashrc echo 'setenv PATH ${PATH}:${HOME}/bin' >> $HOME/.cshrc diff --git a/README b/README index edee81e6..c497cfc8 100644 --- a/README +++ b/README @@ -3,6 +3,7 @@ Please send problems and feedback to bug-parallel@gnu.org. + = Presentation of GNU Parallel = GNU Parallel is a shell tool for executing jobs in parallel using one @@ -34,7 +35,16 @@ The 10 seconds installation will try to do a full installation; if that fails, a personal installation; if that fails, a minimal installation. - (wget -O - pi.dk/3 || curl pi.dk/3/ || fetch -o - http://pi.dk/3) | bash + $ (wget -O - pi.dk/3 || lynx -source pi.dk/3 || curl pi.dk/3/ || \ + fetch -o - http://pi.dk/3 ) > install.sh + $ sha1sum install.sh + 12345678 3374ec53 bacb199b 245af2dd a86df6c9 + $ md5sum install.sh + 029a9ac0 6e8b5bc6 052eac57 b2c3c9ca + $ sha512sum install.sh + 40f53af6 9e20dae5 713ba06c f517006d 9897747b ed8a4694 b1acba1b 1464beb4 + 60055629 3f2356f3 3e9c4e3c 76e3f3af a9db4b32 bd33322b 975696fc e6b23cfb + $ bash install.sh This will literally install faster than reading the rest of this document. @@ -99,7 +109,8 @@ publication please cite: = New versions = -New versions will be released at: ftp://ftp.gnu.org/gnu/parallel/ +New versions will be released at: https://ftp.gnu.org/gnu/parallel/ + = Dependencies = diff --git a/src/parallel b/src/parallel index d2b6550d..96e8bc41 100755 --- a/src/parallel +++ b/src/parallel @@ -5293,6 +5293,7 @@ sub usleep($) { } sub __KILLER_REAPER__() {} + sub reap_usleep() { # Reap dead children. # If no dead children: Sleep specified amount with exponential backoff diff --git a/src/parallel_tutorial.pod b/src/parallel_tutorial.pod index 07efabd7..2b518196 100644 --- a/src/parallel_tutorial.pod +++ b/src/parallel_tutorial.pod @@ -44,8 +44,16 @@ To run this tutorial you must have the following: Install the newest version using your package manager (recommended for security reasons), the way described in README, or with this command: - (wget -O - pi.dk/3 || curl pi.dk/3/ || \ - fetch -o - http://pi.dk/3) | bash + $ (wget -O - pi.dk/3 || lynx -source pi.dk/3 || curl pi.dk/3/ || \ + fetch -o - http://pi.dk/3 ) > install.sh + $ sha1sum install.sh + 12345678 3374ec53 bacb199b 245af2dd a86df6c9 + $ md5sum install.sh + 029a9ac0 6e8b5bc6 052eac57 b2c3c9ca + $ sha512sum install.sh + 40f53af6 9e20dae5 713ba06c f517006d 9897747b ed8a4694 b1acba1b 1464beb4 + 60055629 3f2356f3 3e9c4e3c 76e3f3af a9db4b32 bd33322b 975696fc e6b23cfb + $ bash install.sh This will also install the newest version of the tutorial which you can see by running this: