Move readConfig into freenet-scripts-common

All "source freenet-scripts-common" were followed with readConfig.

Author: Thynix

compare-l10n

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-# Shared default configuration and utility functions.
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
 
-readConfig
-
 buildDir=$(mktemp -d)
 git clone "$fredDir" "$buildDir" || exit 1
 compareL10n "$1"

deploy-website

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit
 
-# Shared default configuration and utility functions.
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
 
 cd $(dirname $0)
@@ -96,8 +96,6 @@ do
     esac
 done
 
-readConfig
-
 if $testing; then
     websiteDir="$websiteStagingDir"
 else

freenet-scripts-common

@@ -93,3 +93,5 @@ function makeBuildDir {
 
     trap rmTemp EXIT
 }
+
+readConfig

insert-update

@@ -2,9 +2,9 @@
 # User should put the real keys in $insertKeys (see ~/.freenetrc)
 # Format of keys file: NEWKEY=[SSK private URI]
 # We used to also include OLDKEY, but this is not used any more, since the transition version is the last build inserted on the old key and the first inserted on the new key.
-# Load the shared utility functions.
+
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
-readConfig
 
 SEEDNODESFILE="$releaseDir/seednodes.fref"
 

reinsert-plugin

@@ -2,9 +2,10 @@
 PLUGIN=$1
 if [[ $PLUGIN == "WoT" ]]; then PLUGIN=WebOfTrust; fi
 TEMPLOC=`mktemp -d`
-# Shared default configuration and utility functions.
+
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
-readConfig
+
 JARNAME=`echo $PLUGIN | cut -d "_" -f 1`
 (echo ClientHello; echo Name=Toad-update-${PLUGIN}; echo ExpectedVersion=2; echo End; echo ClientPut; echo "URI=CHK@"; echo "Identifier=${PLUGIN}.jar"; echo Verbosity=1023; echo MaxRetries=-1; echo UploadFrom=disk; echo "Filename=/usr/src/cvs/eclipse-workspace/app-wininstaller/bin/${PLUGIN}.jar"; echo "TargetFilename=${PLUGIN}.jar"; echo Persistence=forever; echo PriorityClass=2; echo Global=true; echo End) > $TEMPLOC/upload
 cat $TEMPLOC/upload | nc 127.0.0.1 9481

release-build

@@ -4,9 +4,11 @@
 # Usage is "release-build 9999" for build 9999. 
 # TODO Add --help etc.
 # TODO Add --snapshot to proxy to release-fred --snapshot ???
+
+# Load configuration and utility functions.
+source freenet-scripts-common || exit
+
 BUILD=$1
-source freenet-scripts-common || exit 1
-readConfig || exit 1
 
 # Set up agents at the beginning of this script, but not the individual scripts.
 # TODO We could put this in freenet-scripts-common but only if it doesn't get re-run in every script we call.

release-fred

@@ -4,7 +4,7 @@
 # these variables are probably different for everybody
 # so create $HOME/.freenetrc and override those with your desired values.
 
-# Shared default configuration and utility functions.
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
 
 # What to build / release. Possible values: "build", "snapshot"
@@ -63,8 +63,6 @@ EOF
     esac
 done
 
-readConfig
-
 # Target should be set.
 if [[ -z "$target" ]]; then
     echo "Target not set. Please specify --build or --snapshot."

release-installer

@@ -1,7 +1,8 @@
 #!/bin/bash
-# Shared default configuration and utility functions.
-source freenet-scripts-common || exit 1
-readConfig || exit 2
+
+# Load configuration and utility functions.
+source freenet-scripts-common || exit
+
 getBuildInfo
 if [[ -z "$gitVersion" ]]; then echo Could not get git version; exit 4; fi
 echo Version is $buildNumber

release-plugin

@@ -5,9 +5,8 @@
 # it to a CHK with the node on port 9481.
 #
 
-# Shared default configuration and utility functions.
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
-readConfig
 
 if [[ -z "$1" ]]; then
 	cat <<EOF Usage: $0 [plugin name]

release-wininstaller

@@ -40,7 +40,7 @@
 #   Release:
 #       rsync
 
-# Shared default configuration and utility functions.
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
 
 # Whether to exit before releasing.
@@ -117,8 +117,6 @@ EOF
     esac
 done
 
-readConfig
-
 # Make temporary build directory to hold installer source, dependencies,
 # and Wine prefix. This will be wiped on exit.
 makeBuildDir

remote-deploy-website

@@ -3,8 +3,9 @@
 
 # Deploy the website on the webserver using locally-reviewed commit IDs.
 
-source freenet-scripts-common
-readConfig
+# Load configuration and utility functions.
+source freenet-scripts-common || exit
+
 getBuildInfo
 websiteID=$(cd "$websiteOfficialDir"; git rev-parse --verify master)
 

setup-release-environment

@@ -1,7 +1,7 @@
 #!/bin/bash
 
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
-readConfig || exit
 
 # Packages on Debian Wheezy
 # For building Java: openjdk-6-jdk ant

tag-build

@@ -1,8 +1,9 @@
 #!/bin/bash
 # Requires remotes: "origin" = fred-staging, "stable" = fred-official
 # TODO Test for this?
+
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
-readConfig || exit
 
 cd "$fredDir"
 

transifex-pull

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -o errexit
+
 # Pull translation updates from Tranfiex.
 # Even in developer mode the Transifex Client (https://github.com/transifex/transifex-client)
 # includes commented-out untranslated lines, which is not suitable for committing.
@@ -13,9 +15,8 @@
 # See http://support.transifex.com/customer/portal/articles/996071-setup-and-sync-with-tx
 # for details.
 
-set -o errexit
-source freenet-scripts-common
-readConfig
+# Load configuration and utility functions.
+source freenet-scripts-common || exit
 
 # TODO: Move to freenet-scripts-common?
 starting_directory="$(readlink -e "$(dirname "$0")")"

update-bookmarks

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -o errexit
 
-source freenet-scripts-common
-readConfig
+# Load configuration and utility functions.
+source freenet-scripts-common || exit
 
 bookmarkPath="$fredDir/src/freenet/clients/http/staticfiles/defaultbookmarks.dat"
 

update-version

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -o errexit
 
-source freenet-scripts-common
-readConfig
+# Load configuration and utility functions.
+source freenet-scripts-common || exit
 
 versionPath="$fredDir/src/freenet/node/Version.java"
 

verify-build

@@ -5,9 +5,8 @@
 # Uses lib-pyFreenet to fetch the in-Freenet JAR over FCP,
 # and so requires Python and lib-pyFreenet. (fcpget)
 
-# Shared default configuration and utility functions.
+# Load configuration and utility functions.
 source freenet-scripts-common || exit
-readConfig
 
 ## TODO MAJOR: Get the latest build number from somewhere other than the repository, e.g. Freenet, announcements, etc.
 ## TODO MAJOR: Verify the installers