diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh index a59d069bc3213d97be1ea78fb1cfcc25ee19db36..5ea96d1c1e387d5a6ae47de89308bcd8ff08cf91 100644 --- a/Slackware/i2p/doinst.sh +++ b/Slackware/i2p/doinst.sh @@ -12,20 +12,21 @@ config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" if [ ! -r $NEW ]; then - # Flaw in the packaging, this shouldn't happen. Just return. + # If we get here there's a flaw in the packaging. We'll just return so that + # we don't emit a spurious error for the user. (It's not the user's problem). return fi - # If this file doesn't exist yet, drop the .new extension + # If this file doesn't exist yet, drop the .new extension. if [ ! -r $OLD ]; then mv $NEW $OLD return elif [ "$(md5sum $OLD | cut -d' ' -f1)" = "$(md5sum $NEW | cut -d' ' -f1)" ]; then - # If there are no differences in the files, remove the new one + # If there are no differences in the files, remove the file with the .new extension. rm $NEW return fi - # If they differ alert the admin (but let's not be terribly obnoxious about it) + # Alert the admin if they differ, but let's not be terribly obnoxious about it. echo "WARNING: The files $OLD and $NEW differ." >&2 } diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index a02d39e664e69be6c41ca967b08e91748bc170b1..bae5836cb44d24c33ba684e536a118eed5dfafd2 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -11,7 +11,7 @@ # (/opt/i2p by default). # # For safety's sake, a user's I2P config files will *never* be overwritten by any upgrade method. -# In the future this SlackBuild may alert when a default config file is updated +# In the future this SlackBuild may alert when a default config file is updated. ## # Make sure makepkg and friends can be found @@ -55,7 +55,7 @@ I2PBUILD=$(sed -e '/^.\+long\s\+BUILD/!d' -e 's/^.\+long\s\+BUILD\s\+=\s\+\([0-9 # Thanks to user "ihavei2p" for the second awk statement # If the version is x.y, it'll be set to x.y.0. Otherwise the version string will be unchanged CORE=$(awk -F'"' '/static\s+String\s+VERSION/{print $2}' $I2PSRC/core/java/src/net/i2p/CoreVersion.java | \ - awk -F. '{ if (NF > 3) { print; exit } else if ($3 == "") { $3=0; print $1"."$2"."$3 } else print }') + awk -F. '{ if (NF > 3) { print; exit } else if ($3 == "") { $3=0; print $1"."$2"."$3 } else print }') VERSION="${CORE}_${I2PBUILD}" [ -d $PKG ] && rm -rf $PKG @@ -82,7 +82,7 @@ install -d $PKG/usr/doc/$NAME-$VERSION install -d $PKG/etc/rc.d mv licenses LICENSE.txt -t $PKG/usr/doc/$NAME-$VERSION -# runplain will live in the installation directory. eepget and i2prouter will go to /usr/bin +# runplain.sh will live in the installation directory. eepget and i2prouter will go to /usr/bin # with symlinks in INST_DIR (created in doinst.sh) install -m755 i2prouter $PKG/usr/bin install -m755 eepget $PKG/usr/bin @@ -103,7 +103,7 @@ rm -rf ./man # The i2prouter script will try to determine the OS (linux), the bits (32 VS 64) and should be able # to figure out the correct wrapper binary to use. -# Howver: In case the i2prouter script's detection fails, "$INST_DIR/i2psvc" will point to +# However: In case the i2prouter script's detection fails, "$INST_DIR/i2psvc" will point to # what 'we' think the correct binary is. # # A good reason for installing all binaries: in case the user, for whatever reason, switches from an diff --git a/Slackware/i2p/rc.i2p b/Slackware/i2p/rc.i2p index ccbe073b9dd74edd0d5be7a3e8ef02f14d9db7d7..d33f1f44d8e5dc9c51fd8deb14b0cd928672eb49 100644 --- a/Slackware/i2p/rc.i2p +++ b/Slackware/i2p/rc.i2p @@ -14,7 +14,7 @@ set -e # Set the locale as desired. # Note: this is not the same as the language shown in the I2P router console. # This affects the locale used in wrapper.log. For best results, use a -# unicode enabled locale (especially important for foreign language torrents). +# unicode enabled locale. This is especially important for foreign language torrents. # # If not set the user's configured locale will be used. #RCLOCALE= @@ -45,7 +45,7 @@ if [ -z $RCLOCALE ]; then fi fi -# abort script if any variables are unset +# Abort this script if any referenced variables haven't been set set -u if $(uname -m |grep -q '64'); then