diff options
| -rw-r--r-- | tools/builder_common.sh | 10 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 4 | ||||
| -rwxr-xr-x | tools/scripts/generate-privdefs.php | 6 | ||||
| -rwxr-xr-x | tools/scripts/update_package_pfPorts.php | 6 |
4 files changed, 13 insertions, 13 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" diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 97c13cc..da6b996 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -84,7 +84,7 @@ fi # Make sure pkg will not be interactive export ASSUME_ALWAYS_YES=true -# Architecture, supported ARCH values are: +# Architecture, supported ARCH values are: # Tier 1: i386, AMD64, and PC98 # Tier 2: ARM, PowerPC, ia64, Sparc64 and sun4v # Tier 3: MIPS and S/390 @@ -212,7 +212,7 @@ export VMDK_DISK_CAPACITY_IN_GB=${VMDK_DISK_CAPACITY_IN_GB:-"8"} export OVA_FIRST_PART_SIZE_IN_GB=${OVA_FIRST_PART_SIZE_IN_GB:-"6"} # swap partition size (freebsd-swap) export OVA_SWAP_PART_SIZE_IN_GB=${OVA_SWAP_PART_SIZE_IN_GB:-"2"} -# Calculate real swap size, removing 128 blocks (65536 bytes) beggining/loader +# Calculate real swap size, removing 128 blocks (65536 bytes) beginning/loader export OVA_SWAP_PART_SIZE=$((${OVA_SWAP_PART_SIZE_IN_GB}*1024*1024*1024-65536)) # Temporary place to save files export OVA_TMP=${OVA_TMP:-"${SCRATCHDIR}/ova_tmp"} diff --git a/tools/scripts/generate-privdefs.php b/tools/scripts/generate-privdefs.php index fb1f09b..553be1e 100755 --- a/tools/scripts/generate-privdefs.php +++ b/tools/scripts/generate-privdefs.php @@ -100,7 +100,7 @@ foreach ($found as $fname) echo "--Generating privilege definitions--\n"; $privdef = $prefix."etc/inc/priv.defs.inc"; -$fp = fopen($privdef,"w"); +$fp = fopen($privdef, "w"); if (!$fp) { echo "unable to open {$privdef}\n"; exit -2; @@ -196,7 +196,7 @@ echo "--Checking for pages without privilege definitions--\n"; foreach ($found as $fname) { $match = false; foreach ($pages_current as $pname => $pdesc) { - if (!strcmp($pname,$fname)) { + if (!strcmp($pname, $fname)) { $match = true; break; } @@ -210,7 +210,7 @@ echo "--Checking for stale privilege definitions--\n"; foreach ($pages_current as $pname => $pdesc) { $match = false; foreach ($found as $fname) { - if (!strncmp($fname,$pname,strlen($fname))) { + if (!strncmp($fname, $pname, strlen($fname))) { $match = true; break; } diff --git a/tools/scripts/update_package_pfPorts.php b/tools/scripts/update_package_pfPorts.php index 7536b36..3962ae0 100755 --- a/tools/scripts/update_package_pfPorts.php +++ b/tools/scripts/update_package_pfPorts.php @@ -55,7 +55,7 @@ $opts .= "t:"; // Path to ports tree repo $options = getopt($opts); -if(!isset($options['x'])) +if (!isset($options['x'])) usage(); // Set the XML filename that we are processing @@ -85,7 +85,7 @@ if (is_dir("{$src_dir}/etc/inc")) { } $pkgs = parse_xml_config_pkg($xml_filename, "pfsensepkgs"); -if(!$pkgs) { +if (!$pkgs) { echo "!!! An error occurred while trying to process {$xml_filename}. Exiting.\n"; exit; } @@ -101,7 +101,7 @@ if (isset($options['p'])) { $pfs_version = trim(file_get_contents("{$src_dir}/etc/version")); -foreach($pkgs['packages']['package'] as $pkg) { +foreach ($pkgs['packages']['package'] as $pkg) { if (isset($pkg_list) && !in_array(strtolower($pkg['name']), $pkg_list)) continue; |
