diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-11 13:04:26 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-11 13:04:26 -0200 |
commit | 24f2a16a33d215cea64c7357e217652e2f6fd1c1 (patch) | |
tree | bb7081dbeb8719d1eca273b4571fe02f0fcb8ed0 /tools/builder_common.sh | |
parent | 48e47796e088eeaab3cff4e3cf67a52d278ad91d (diff) | |
parent | 97bc6c7868b4e6c7c04d7328de656190251bc012 (diff) | |
download | pfsense-24f2a16a33d215cea64c7357e217652e2f6fd1c1.zip pfsense-24f2a16a33d215cea64c7357e217652e2f6fd1c1.tar.gz |
Merge pull request #2206 from phil-davis/r002
Diffstat (limited to 'tools/builder_common.sh')
-rw-r--r-- | tools/builder_common.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 15ddc36..c687a18 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1588,7 +1588,7 @@ pkg_bootstrap() { } # This routine assists with installing various -# freebsd ports files into the pfsenese-fs staging +# freebsd ports files into the pfsense-fs staging # area. install_pkg_install_ports() { local MAIN_PKG="${1}" @@ -1751,7 +1751,7 @@ poudriere_possible_archs() { local _arch=$(uname -m) local _archs="i386.i386" - # IF host is amd64, we'll create both repos, and if possible armv6 + # If host is amd64, we'll create both repos, and if possible armv6 if [ "${_arch}" = "amd64" ]; then _archs="amd64.amd64 ${_archs}" @@ -2032,7 +2032,7 @@ poudriere_update_ports() { if ! poudriere ports -l | grep -q -E "^${POUDRIERE_PORTS_NAME}[[:blank:]]"; then poudriere_create_ports_tree else - echo -n ">>> Reseting local changes on ports tree ${POUDRIERE_PORTS_NAME}... " | tee -a ${LOGFILE} + echo -n ">>> Resetting local changes on ports tree ${POUDRIERE_PORTS_NAME}... " | tee -a ${LOGFILE} script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" reset --hard >/dev/null 2>&1 script -aq ${LOGFILE} git -C "/usr/local/poudriere/ports/${POUDRIERE_PORTS_NAME}" clean -fd >/dev/null 2>&1 echo "Done!" | tee -a ${LOGFILE} @@ -2099,7 +2099,7 @@ poudriere_bulk() { print_error_pfS fi - # ./ is intentional, it's a rsync trick to make it chdir to directory before send it + # ./ is intentional, it's an rsync trick to make it chdir to directory before sending it pkg_repo_rsync "/usr/local/poudriere/data/packages/./${jail_name}-${POUDRIERE_PORTS_NAME}" done } @@ -2236,7 +2236,7 @@ snapshots_scp_files() { fi snapshots_update_status ">>> Copying core pkg repo to ${PKG_RSYNC_HOSTNAME}" - # Add ./ before last directory, it's rsync trick to make it chdir to parent directory before send + # Add ./ before last directory, it's an rsync trick to make it chdir to parent directory before sending pkg_repo_rsync $(echo "${CORE_PKG_PATH}" | sed -E 's,/$,,; s,/([^/]*)$,/./\1,') snapshots_update_status ">>> Finished copying core pkg repo" |