From f1d74d928a7ce106dad9303c036222823f347af2 Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Sun, 28 Apr 2013 22:00:17 -0400 Subject: Remove backslash typo from makepkg man page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Dan McGee --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index bb7a9a3f..53a78677 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -17,7 +17,7 @@ Synopsis Description ----------- 'makepkg' is a script to automate the building of packages. The requirements for -using the script are a build-capable \*nix platform and a custom build script +using the script are a build-capable *nix platform and a custom build script for each package you wish to build (known as a PKGBUILD). See linkman:PKGBUILD[5] for details on creating your own build scripts. -- cgit v1.2.3-54-g00ecf From fe794ccb25d3ab1f7c07331b437b61c30c08a018 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 4 Jun 2013 13:38:48 +1000 Subject: Restrict pkgname from starting with a dot. Adding this restriction means we can filter any FILENAME entry from starting with a "/" or a ".". Use the term "dot" as it is more computing relevant compared to "full stop" or "period" which vary depending on English locale. Signed-off-by: Allan McRae --- doc/PKGBUILD.5.txt | 2 +- scripts/makepkg.sh.in | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index ea280a0e..e78a8e5a 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -42,7 +42,7 @@ similar to `$_basekernver`. Either the name of the package or an array of names for split packages. Valid characters for members of this array are alphanumerics, and any of the following characters: ```@ . _ + -`''. Additionally, names are not - allowed to start with hyphens. + allowed to start with hyphens or dots. *pkgver*:: The version of the software as released from the author (e.g., '2.7.1'). diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 08dcf4ce..a8a552ff 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2111,6 +2111,10 @@ check_sanity() { error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" ret=1 fi + if [[ ${i:0:1} = "." ]]; then + error "$(gettext "%s is not allowed to start with a dot.")" "pkgname" + ret=1 + fi if [[ $i = *[^[:alnum:]+_.@-]* ]]; then error "$(gettext "%s contains invalid characters: '%s'")" \ 'pkgname' "${pkgname//[[:alnum:]+_.@-]}" -- cgit v1.2.3-54-g00ecf