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:16:00 -0300 |
| commit | 25c86b03ea8dfa4cea04a82e4694991c88c317cd (patch) | |
| tree | 8b991793d0241c3ffe6f23c3692414e7eaa87379 /tools | |
| parent | 701e028a359475787adf24726da6d48db4cabfa7 (diff) | |
| download | pfsense-25c86b03ea8dfa4cea04a82e4694991c88c317cd.zip pfsense-25c86b03ea8dfa4cea04a82e4694991c88c317cd.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 478289b..eee7eb3 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -56,7 +56,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})) @@ -64,7 +64,7 @@ export BUILDER_ROOT=$(realpath "${BUILDER_TOOLS}/..") NO_IMAGES="" NO_RESET="" -NO_UPLOAD="" +UPLOAD="" LOOPED_SNAPSHOTS="" POUDRIERE_SNAPSHOTS="" @@ -84,7 +84,7 @@ while getopts lnpru opt; do NO_RESET=1 ;; u) - NO_UPLOAD="-u" + UPLOAD="-U" ;; *) usage @@ -108,7 +108,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 "$*" } @@ -221,7 +221,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 @@ -232,7 +232,7 @@ while [ /bin/true ]; do if [ $rc -eq 0 ]; then exec_and_update_status \ - ${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size \ + ${BUILDER_ROOT}/build.sh ${UPLOAD} --flash-size \ '2g 4g' --snapshots \ ${IMAGES} rc=$? diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 910080f..71d32f6 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1964,7 +1964,7 @@ pkg_repo_rsync() { fi fi - if [ -n "${DO_NOT_UPLOAD}" ]; then + if [ -z "${UPLOAD}" ]; then return fi @@ -2382,7 +2382,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 |
