scripts: fix various typos

This only affects typos in comments or user-facing output.

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
[only picks changes to scripts, drop "commandline" replacement,
 fix case for "arbitrary", improve commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit 08622de7d66eb90038de54f34ab2fe2308424fd0)
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 81b1ffcb56007f9c5df5448da583e809daf95b38..2adc5efec5e6bf1061d6b9133eca2111b0e1dec6 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4697,7 +4697,7 @@ sub process {
 ##                 $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) {
 ##
 ##                     # Remove any bracketed sections to ensure we do not
-##                     # falsly report the parameters of functions.
+##                     # falsely report the parameters of functions.
 ##                     my $ln = $line;
 ##                     while ($ln =~ s/\([^\(\)]*\)//g) {
 ##                     }

diff --git a/scripts/dl_github_archive.py b/scripts/dl_github_archive.py
index 59fd7067be921dbca8987e90880755f2ccfb5315..b992227dc98ae20b3b4e7d564a2d0bdd9efb2a21 100755 (executable)
--- a/scripts/dl_github_archive.py
+++ b/scripts/dl_github_archive.py
@@ -207,7 +207,7 @@ class GitHubCommitTsCache(object):
 
 
 class DownloadGitHubTarball(object):
-    """Download and repack archive tarabll from GitHub.
+    """Download and repack archive tarball from GitHub.
 
     Compared with the method of packing after cloning the whole repo, this
     method is more friendly to users with fragile internet connection.
@@ -220,7 +220,7 @@ class DownloadGitHubTarball(object):
 
      - GitHub archives do not contain source codes for submodules.
 
-     - GitHub archives seem to respect .gitattributes and ignore pathes with
+     - GitHub archives seem to respect .gitattributes and ignore paths with
        export-ignore attributes.
 
     For the first two issues, the method will fail loudly to allow fallback to

diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
index ee7d9532f5de79588900920e73046221679541b7..4da287591acc0aef63b87096d41e6fe9ef16e88f 100755 (executable)
--- a/scripts/ext-toolchain.sh
+++ b/scripts/ext-toolchain.sh
@@ -569,7 +569,7 @@ while [ -n "$1" ]; do
                        echo -e "  Most commands also take a --cflags parameter which " >&2
                        echo -e "  is used to specify C flags to be passed to the "     >&2
                        echo -e "  cross compiler when performing tests."               >&2
-                       echo -e "  This paremter may be repeated multiple times."       >&2
+                       echo -e "  This parameter may be repeated multiple times."      >&2
                        exit 1
                ;;
 

diff --git a/scripts/json_overview_image_info.py b/scripts/json_overview_image_info.py
index db47fd9e426458c820bd878ca810d8ba2a87f672..89b7d4fe202c3859b2e3f12341f1252196448b56 100755 (executable)
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@@ -7,7 +7,7 @@ from sys import argv
 import json
 
 if len(argv) != 2:
-    print("JSON info files script requires ouput file as argument")
+    print("JSON info files script requires output file as argument")
     exit(1)
 
 output_path = Path(argv[1])

diff --git a/scripts/linksys-image.sh b/scripts/linksys-image.sh
index 36a676d9648ff3af27ff65b77aeeebe5e0677dc0..c3baf44844a0ac3e59024fcd57de76e672945b9c 100755 (executable)
--- a/scripts/linksys-image.sh
+++ b/scripts/linksys-image.sh
@@ -11,11 +11,11 @@
 # This is appended to the factory image and is tested by the Linksys Upgrader - as observed in civic.
 # The footer is 256 bytes. The format is:
 #  .LINKSYS.        This is detected by the Linksys upgrader before continuing with upgrade. (9 bytes)
-#  <VERSION>        The version number of upgrade. Not checked so use arbitary value (8 bytes)
+#  <VERSION>        The version number of upgrade. Not checked so use arbitrary value (8 bytes)
 #  <TYPE>           Model of target device, padded (0x20) to (15 bytes)
 #  <CRC>           CRC checksum of the image to flash (8 byte)
 #  <padding>       Padding (0x20) (7 bytes)
-#  <signature>     Signature of signer. Not checked so use Arbitary value (16 bytes)
+#  <signature>     Signature of signer. Not checked so use arbitrary value (16 bytes)
 #  <padding>        Padding (0x00) (192 bytes)
 #  0x0A                    (1 byte)
 

diff --git a/scripts/pad_image b/scripts/pad_image
index b1941a28d8d3e6728624e3c6c62480f2371fbe4f..871063af3437f9e9c013e133ac64f5f26f1147d3 100755 (executable)
--- a/scripts/pad_image
+++ b/scripts/pad_image
@@ -2,7 +2,7 @@
 
 function usage {
   echo "Usage: prepare_image image_type kernel_image rootfs_image header_size"
-  echo "Padd root and kernel image to the correct size and append the jffs2 start marker as needed"
+  echo "Pad root and kernel image to the correct size and append the jffs2 start marker as needed"
   exit 1
 }
 

diff --git a/scripts/sign_images.sh b/scripts/sign_images.sh
index c41b21e0918ee4f7ae80e0722dd89fd7024f298a..f37c2f5016c43c1e9a5a3969a051425708466f8b 100755 (executable)
--- a/scripts/sign_images.sh
+++ b/scripts/sign_images.sh
@@ -3,12 +3,12 @@
 # directory where search for images
 TOP_DIR="${TOP_DIR:-./bin/targets}"
 # key to sign images
-BUILD_KEY="${BUILD_KEY:-key-build}" # TODO unifiy naming?
+BUILD_KEY="${BUILD_KEY:-key-build}" # TODO unify naming?
 # remove other signatures (added e.g.  by buildbot)
 REMOVE_OTER_SIGNATURES="${REMOVE_OTER_SIGNATURES:-1}"
 
 # find all sysupgrade images in TOP_DIR
-# factory images don't need signatures as non OpenWrt system doen't check them anyway
+# factory images don't need signatures as non OpenWrt system doesn't check them anyway
 for image in $(find $TOP_DIR -type f -name "*-sysupgrade.bin"); do
        # check if image actually support metadata
        if fwtool -i /dev/null "$image"; then

diff --git a/scripts/size_compare.sh b/scripts/size_compare.sh
index 8b047a451e7708e99c49d34d2dd6aea9438bc4d4..a5cc3337c74795ada68c6a677710381c183fa501 100755 (executable)
--- a/scripts/size_compare.sh
+++ b/scripts/size_compare.sh
@@ -7,9 +7,9 @@
 ###
 ### The script compares locally compiled package with the package indexes
 ### available upstream. This way the storage impact of optimizations or
-### feature modifiactions is easy to see.
+### feature modifications is easy to see.
 ###
-### If no environmental variables are set the scritp reads the current
+### If no environmental variables are set the script reads the current
 ### .config file. The evaluated env variables are the following:
 ###
 ###   TARGET SUBTARGET ARCH PACKAGES BIN_DIR BASE_URL CHECK_INSTALLED

diff --git a/scripts/slugimage.pl b/scripts/slugimage.pl
index 8c0654d4f6f5e373646589e33fa438f0454bccf6..366b239e960fb3978f7f795a397e685c27d7fc79 100755 (executable)
--- a/scripts/slugimage.pl
+++ b/scripts/slugimage.pl
@@ -772,7 +772,7 @@ sub writeOutFirmware {
                                 $_->{'name'}, $filename);
            }
 
-           # If the next parition is before the end of the current image, then rewind.
+           # If the next partition is before the end of the current image, then rewind.
            elsif ($_->{'offset'} < $end_point) {
                $debug and printf("Rewound %s before <%s> in \"%s\"\n",
                                  (($end_point - $_->{'offset'}) >= $block_size ?
@@ -971,7 +971,7 @@ if (!GetOptions("d|debug"       => \$debug,
     print "  [-b|--redboot]   <file>           Input/Output RedBoot filename\n";
     print "  [-s|--sysconf]   <file>           Input/Output SysConf filename\n";
     print "  [-L|--loader]    <file>           Second stage boot loader filename\n";
-    print "  [-k|--kernel]    <file>           Input/Ouptut Kernel filename\n";
+    print "  [-k|--kernel]    <file>           Input/Output Kernel filename\n";
     print "  [-r|--ramdisk]   <file>           Input/Output Ramdisk filename(s)\n";
     print "  [-f|--fisdir]    <file>           Input/Output FIS directory filename\n";
     print "  [-m|--microcode] <file>           Input/Output Microcode filename\n";