コミット: 124bb57b04fa0d6f7c254478fb66b1238b953191 - mingw.pkg (git)

Experimental package creation tool for MinGW.org

コミットメタ情報

• リビジョン: 124bb57b04fa0d6f7c254478fb66b1238b953191 (tree)
• 日時: 2022-03-11 05:46:28
• 作者: Keith Marshall <keith@user...>
• コミッター: Keith Marshall

ログメッセージ

Avoid accidental overwrite of pkgspec files.

* src/modules/options.sh (OUTPUT_STREAMING_OPTION): Rename as...
(write_stdout): ...this; set value to "true", when applicable.

* src/modules/mkspec.sh (write_stdout): Evaluate it.
(SPECSFILE_DIR, SPECSFILE): Identify pkgspec file as a composite of
this pair of shell variables; do NOT include any contribution from...
(RELEASE): ...this additional variable, even if it is assigned.
[! write_stdout]: Test for prior existence of pkgspec file;
abort when already present.

変更サマリ

• modified: src/modules/mkspec.sh
• modified: src/modules/options.sh

差分

--- a/src/modules/mkspec.sh
+++ b/src/modules/mkspec.sh
@@ -32,10 +32,18 @@
 #
 # -----------------------------------------------------------------------------
 #
-( test "${OUTPUT_STREAMING_OPTION+"set"}" = set || {
-    mkdir -p ${PACKAGE_SRCDIR-"."}/arch/${ARCH-"mingw32"}
-    SPECSFILE=$PACKAGE-$VERSION${RELEASE+"-$RELEASE"}${ARCH+"-$ARCH"}.pkgspec
-    exec > ${PACKAGE_SRCDIR-"."}/arch/${ARCH-"mingw32"}/$SPECSFILE
+  local SPECSFILE SPECSFILE_DIR
+  SPECSFILE_DIR=${PACKAGE_SRCDIR-"."}/arch/${ARCH-"mingw32"}
+  SPECSFILE=$PACKAGE-$VERSION${ARCH+"-$ARCH"}.pkgspec
+  ${write_stdout=false} || {
+    test -e "$SPECSFILE_DIR/$SPECSFILE" && {
+      error "file '$SPECSFILE' already exists"; exit 1
+    }
+  }
+#
+( $write_stdout || {
+    mkdir -p "$SPECSFILE_DIR"
+    exec > "$SPECSFILE_DIR/$SPECSFILE"
   }
 
   test "${RELEASE+"set"}" = set && RELEASE_PREFIX="" || RELEASE_PREFIX="# "

--- a/src/modules/options.sh
+++ b/src/modules/options.sh
@@ -47,7 +47,7 @@
   opteval_verbose() { OPTION_VERBOSE=true; }
 
   optdefine c stdout
-  opteval_stdout() { OUTPUT_STREAMING_OPTION=stdout; }
+  opteval_stdout() { write_stdout=true; }
 
   optdefine option requires_argument
   opteval_option() { option $optarg; }