Commit: 62159e13ca41b691b8a09c027af242308d0632b3 - mingw.pkg (git)

Experimental package creation tool for MinGW.org

Commit MetaInfo

• Revision: 62159e13ca41b691b8a09c027af242308d0632b3 (tree)
• Time: 2022-03-09 23:43:21
• Author: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Log Message

Honour "--identity" option for specification file name.

* src/modules/pkgspec.sh (pkgspec_from_srcdir): Prioritize over...
[-n PACKAGE_ABS_SRCDIR] (PACKAGE_ABS_SRCDIR): ...this, preferred to...
[-z PACKAGE_ABS_SRCDIR] (PACKAGE_SRCDIR): ...this; do NOT use this by
default, because it doesn't yield a valid specification file name, in
the common case where its basename is "..", or ".".

Change Summary

• modified: src/modules/pkgspec.sh

Incremental Difference

--- a/src/modules/pkgspec.sh
+++ b/src/modules/pkgspec.sh
@@ -60,11 +60,13 @@
 # a suitable default from the name of the top-level source code directory.
 #
   pkgspec_from_srcdir() {
-    pkgspec_request_class=pkgspec_$1
+    local pkgspec_request_class=pkgspec_$1
     #
     # An optional second argument overrides the default derivation.
     #
-    IFS=-; set -- ${2-`basename "$PACKAGE_SRCDIR"`}; IFS=
+    local default_srcdir="$PACKAGE_ABS_SRCDIR"
+    test -n "$default_srcdir" || default_srcdir="$PACKAGE_SRCDIR"
+    IFS=-; set -- ${2-${PORTSPEC-`basename "$default_srcdir"`}}; IFS=
     value= fs=; $pkgspec_request_class "$@"
   }
   pkgspec_get_name() {