From dc99ce423ac6a20ad51f4fb06171af7cb3f42b24 Mon Sep 17 00:00:00 2001 From: Samanta Navarro Date: Sat, 24 Jul 2021 11:53:11 +0000 Subject: [PATCH] abuild: fix typos Typos found with codespell --- APKBUILD.5 | 2 +- abuild-fetch.c | 8 ++++---- abuild.in | 6 +++--- abump.in | 2 +- newapkbuild.in | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/APKBUILD.5 b/APKBUILD.5 index 066b3d1..bcc129a 100644 --- a/APKBUILD.5 +++ b/APKBUILD.5 @@ -171,7 +171,7 @@ script as well; see for more information about install scripts. .It Cm pkgusers Specifies a space-separated list of user logins to create during build-time. -Note that you will ned to create the user logins in a pre-install install +Note that you will need to create the user logins in a pre-install install script as well; see .Sx Install Scripts for more information about install scripts. diff --git a/abuild-fetch.c b/abuild-fetch.c index 18c0612..4f77a72 100644 --- a/abuild-fetch.c +++ b/abuild-fetch.c @@ -78,14 +78,14 @@ int fork_exec(char *argv[], int showerr) return r; } -static int aquire_lock(const char *lockfile) +static int acquire_lock(const char *lockfile) { int lockfd = open(lockfile, O_WRONLY|O_CREAT, 0660); if (lockfd < 0) err(1, "%s", lockfile); if (lockf(lockfd, F_LOCK, 0) == -1) - err(1, "failed to aquire lock: %s", lockfile); + err(1, "failed to acquire lock: %s", lockfile); return lockfd; } @@ -133,7 +133,7 @@ int fetch(char *url, const char *destdir, bool insecure) snprintf(lockfile, sizeof(lockfile), "%s.lock", outfile); snprintf(partfile, sizeof(partfile), "%s.part", outfile); - lockfd = aquire_lock(lockfile); + lockfd = acquire_lock(lockfile); if (access(outfile, F_OK) == 0) goto fetch_done; @@ -180,7 +180,7 @@ int fetch(char *url, const char *destdir, bool insecure) fetch_done: release_lock(lockfd); - // give other processes the chance to aquire the lock if they have the file open + // give other processes the chance to acquire the lock if they have the file open sleep(0); if (status == 0 || try_lock(lockfd)) diff --git a/abuild.in b/abuild.in index 5990997..52e7563 100644 --- a/abuild.in +++ b/abuild.in @@ -170,7 +170,7 @@ spell_error() { die "APKBUILD contains '$1'. It should be '$2'" } -# check if apkbuild is basicly sane +# check if apkbuild is basically sane default_sanitycheck() { local i= j= suggestion= msg "Checking sanity of $APKBUILD..." @@ -267,7 +267,7 @@ default_sanitycheck() { || die "${i##*/} is missing in checksums" # verify that our source does not have git tag version - # name as tarball (typicallly github) + # name as tarball (typically github) if is_remote "$i" && [ "${i#*::}" = "$i" ]; then case ${i##*/} in v$pkgver.tar.*|$pkgver.tar.*) @@ -766,7 +766,7 @@ postcheck() { fi # Alpine Linux as a musl libc distro does not use /lib64 or /usr/lib64 under - # any circunstance, packages installing to it are 100% sure a packaging error + # any circumstance, packages installing to it are 100% sure a packaging error # except when we are doing GNU Libc compatibility which should be rare enough # to warrant a lib64 check if ! options_has "lib64"; then diff --git a/abump.in b/abump.in index 8358555..48d1eed 100644 --- a/abump.in +++ b/abump.in @@ -37,7 +37,7 @@ do_bump() { ( set -e - # calculate APKBUILD's path #vim syntax higlight ' + # calculate APKBUILD's path #vim syntax highlight ' if [ "${name#*/}" != "$name" ] && ! [ -d "$APORTSDIR/${name%/*}" ]; then die "'$p' should be of form 'foo-1.2.3' or 'main/foo-1.2.3'" fi diff --git a/newapkbuild.in b/newapkbuild.in index eb359dd..c58d519 100644 --- a/newapkbuild.in +++ b/newapkbuild.in @@ -446,7 +446,7 @@ usage() { -m Create meson package (Assume meson.build is there) -p Create perl package (Assume Makefile.PL is there) -y Create python package (Assume setup.py is there) - -r Crate rust package (Assume Cargo.toml is there) + -r Create rust package (Assume Cargo.toml is there) -s Use sourceforge source URL -c Copy a sample init.d, conf.d, and install script -f Force even if directory already exists