diff options
| author | Renato Botelho <renato@netgate.com> | 2017-08-23 17:14:34 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-08-23 17:14:34 -0300 |
| commit | f6c83d052921736a6a4160b4850876f10d905eaf (patch) | |
| tree | 49bb71939be4267440a854a9470eca3a2e20fbfd /tools | |
| parent | c51193a9151f027013c4fe77cb044ae15a6f4b81 (diff) | |
| download | pfsense-f6c83d052921736a6a4160b4850876f10d905eaf.zip pfsense-f6c83d052921736a6a4160b4850876f10d905eaf.tar.gz | |
Change default to never upload files and add a new option to do it
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build_snapshots.sh | 12 | ||||
| -rw-r--r-- | tools/builder_common.sh | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index 693fc50..8e87751 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -24,7 +24,7 @@ usage() { echo " -n: Do not build images, only core pkg repo" echo " -p: Update poudriere repo" echo " -r: Do not reset local changes" - echo " -u: Do not upload snapshots" + echo " -U: Upload snapshots" } export BUILDER_TOOLS=$(realpath $(dirname ${0})) @@ -32,7 +32,7 @@ export BUILDER_ROOT=$(realpath "${BUILDER_TOOLS}/..") IMAGES="all" NO_RESET="" -NO_UPLOAD="" +UPLOAD="" LOOPED_SNAPSHOTS="" POUDRIERE_SNAPSHOTS="" @@ -52,7 +52,7 @@ while getopts lnpru opt; do NO_RESET=1 ;; u) - NO_UPLOAD="-u" + UPLOAD="-U" ;; *) usage @@ -76,7 +76,7 @@ export COUNTER=0 export _sleeping=0 snapshot_update_status() { - ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} ${POUDRIERE_SNAPSHOTS} \ + ${BUILDER_ROOT}/build.sh ${UPLOAD} ${POUDRIERE_SNAPSHOTS} \ --snapshot-update-status "$*" } @@ -189,7 +189,7 @@ while [ /bin/true ]; do if [ $rc -eq 0 ]; then exec_and_update_status \ - ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} \ + ${BUILDER_ROOT}/build.sh ${UPLOAD} \ --update-pkg-repo rc=$? fi @@ -200,7 +200,7 @@ while [ /bin/true ]; do if [ $rc -eq 0 ]; then exec_and_update_status \ - ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --snapshots \ + ${BUILDER_ROOT}/build.sh ${UPLOAD} --snapshots \ ${IMAGES} rc=$? fi diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 1c86116..9646bc8 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1309,7 +1309,7 @@ pkg_repo_rsync() { fi fi - if [ -n "${DO_NOT_UPLOAD}" ]; then + if [ -z "${UPLOAD}" ]; then return fi @@ -1688,7 +1688,7 @@ poudriere_bulk() { LOGFILE=${BUILDER_LOGS}/poudriere.log - if [ -z "${DO_NOT_UPLOAD}" -a -z "${PKG_RSYNC_HOSTNAME}" ]; then + if [ -n "${UPLOAD}" -a -z "${PKG_RSYNC_HOSTNAME}" ]; then echo ">>> ERROR: PKG_RSYNC_HOSTNAME is not set" print_error_pfS fi |
