Commit: 31e1a0101520daf5f8b8e66345a2121745337a3b - mingw.pkg (git)

Experimental package creation tool for MinGW.org

Commit MetaInfo

• Révision: 31e1a0101520daf5f8b8e66345a2121745337a3b (tree)
• l'heure: 2022-03-07 21:51:44
• Auteur: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Message de Log

Verify accessibility of git and hg root directories.

* src/plugins/git.sh src/plugins/hg.sh (initialize_abs_srcdir): Use it
to verify that the nominated package source directory actually exists;
abort if it doesn't, when it is required to do so.

Change Summary

• modified: src/plugins/git.sh
• modified: src/plugins/hg.sh

Modification

--- a/src/plugins/git.sh
+++ b/src/plugins/git.sh
@@ -10,7 +10,7 @@
 # $Id$
 #
 # Written by Keith Marshall <[e-mail]>
-# Copyright (C) 2019, MinGW.OSDN Project
+# Copyright (C) 2019, 2022, MinGW.OSDN Project
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -57,6 +57,7 @@
 #
   defn_add_hook initialize plugin git_plugin_initialize
   git_plugin_initialize() {
+    initialize_abs_srcdir || exit
     phase "initialize local git repository"
     ( cd $PACKAGE_SRCDIR
       git init --quiet
@@ -105,6 +106,7 @@
   defn_set_hook stage_srcdist plugin git_plugin_stage_srcdist
   git_plugin_stage_srcdist() {
     step "check source tree integrity"
+    initialize_abs_srcdir || exit
     #
     # The "mingw-pkg distribute" action is not allowed to proceed, if
     # the source code repository is contaminated by untracked files, or

--- a/src/plugins/hg.sh
+++ b/src/plugins/hg.sh
@@ -10,7 +10,7 @@
 # $Id$
 #
 # Written by Keith Marshall <[e-mail]>
-# Copyright (C) 2011-2013, 2016-2019, MinGW.OSDN Project
+# Copyright (C) 2011-2013, 2016-2019, 2020, 2022, MinGW.OSDN Project
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -36,19 +36,20 @@
   STAGED_PKGROOT=${STAGED_PKGROOT-"`pwd`"}
 
 # When running hg, on behalf of this plug-in, we may need to ensure that
-# it is run in the top source directory; invoking it as $HG_CMD guarantees
+# it is run in the top source directory; invoking it as HG_CMD guarantees
 # that this requirement is satisfied.
 #
-  HG_CMD='eval hg --cwd "$PACKAGE_ABS_SRCDIR"'
+  HG_CMD() { hg --cwd "`abs_srcdir`" "$@"; }
 
 # The hg_plugin_initialize function hooks into the "mingw-pkg initialize"
 # action, to set up the requisite hg repository whence any distributable
 # package images will be constructed.  Note that this runs a sequence of
 # hg commands within a sub-shell; changing the working directory for this
-# sub-shell obviates the need to use $HG_CMD.
+# sub-shell obviates the need to use HG_CMD.
 #
   defn_add_hook initialize plugin hg_plugin_initialize
   hg_plugin_initialize() {
+    initialize_abs_srcdir || exit
     phase "initialize local mercurial repository"
     ( cd $PACKAGE_SRCDIR
       hg init
@@ -78,7 +79,7 @@
 #
   action_load_package_specs() { hg_plugin_load_package_specs; }
   hg_plugin_load_package_specs() { action_prepare_package_specs
-    test -f $PACKAGE_SRCDIR/arch/${ARCH="`$HG_CMD branch 2> /dev/null \
+    test -f $PACKAGE_SRCDIR/arch/${ARCH="`HG_CMD branch 2> /dev/null \
       || echo $ARCH_DEFAULT`"}/$PACKAGE-$VERSION-$ARCH.pkgspec && \
       . $PACKAGE_SRCDIR/arch/$ARCH/$PACKAGE-$VERSION-$ARCH.pkgspec
   }
@@ -90,8 +91,9 @@
 # any applied patches, which must be managed by MQ.
 #
   defn_set_hook stage_srcdist plugin hg_plugin_stage_srcdist
-  hg_plugin_stage_srcdist() { local HG_ROOT=`$HG_CMD root`
+  hg_plugin_stage_srcdist() {
     step "check source tree integrity"
+    initialize_abs_srcdir && local HG_ROOT=`HG_CMD root` || exit
     #
     # The "mingw-pkg distribute" action is not allowed to proceed, if
     # the source code repository is contaminated by untracked files, or
@@ -101,11 +103,11 @@
       show_status() {
 	warning "$1"; printf >&2 '%s\n\n' "$warning_colour$2$unbold"
       }
-      untracked="`$HG_CMD status | grep '^?'`" && {
+      untracked="`HG_CMD status | grep '^?'`" && {
 	show_status "untracked files in source tree..." "$untracked"
 	${ignore_untracked_files-false} || EXIT_CODE=1
       }
-      uncommitted="`$HG_CMD status | grep '^[AMR!]'`" && {
+      uncommitted="`HG_CMD status | grep '^[AMR!]'`" && {
 	show_status "locally modified files in source tree..." "$uncommitted"
 	EXIT_CODE=1
       }