Update (self-)references to *stub* script

src/stub

@@ -23,23 +23,23 @@ init_core
 
 mkit_import ini
 
-declare -A MKIT_INIT_LICENSES
-MKIT_INIT_LICENSES[GPLv1]="http://www.gnu.org/licenses/old-licenses/gpl-1.0.md"
-MKIT_INIT_LICENSES[GPLv2]="http://www.gnu.org/licenses/old-licenses/gpl-2.0.md"
-MKIT_INIT_LICENSES[GPLv3]="http://www.gnu.org/licenses/gpl-3.0.md"
-MKIT_INIT_LICENSES[LGPLv2]="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.md"
-MKIT_INIT_LICENSES[LGPLv3]="http://www.gnu.org/licenses/lgpl-3.0.md"
-MKIT_INIT_LICENSES[AGPLv3]="http://www.gnu.org/licenses/agpl-3.0.md"
-MKIT_INIT_LICENSES[FDLv1.3]="http://www.gnu.org/licenses/fdl-1.3.md"
-MKIT_INIT_LICENSES[FDLv1.2]="http://www.gnu.org/licenses/old-licenses/fdl-1.2.md"
-MKIT_INIT_LICENSES[FDLv1.1]="http://www.gnu.org/licenses/old-licenses/fdl-1.1.md"
+declare -A MKIT_STUB_LICENSES
+MKIT_STUB_LICENSES[GPLv1]="http://www.gnu.org/licenses/old-licenses/gpl-1.0.md"
+MKIT_STUB_LICENSES[GPLv2]="http://www.gnu.org/licenses/old-licenses/gpl-2.0.md"
+MKIT_STUB_LICENSES[GPLv3]="http://www.gnu.org/licenses/gpl-3.0.md"
+MKIT_STUB_LICENSES[LGPLv2]="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.md"
+MKIT_STUB_LICENSES[LGPLv3]="http://www.gnu.org/licenses/lgpl-3.0.md"
+MKIT_STUB_LICENSES[AGPLv3]="http://www.gnu.org/licenses/agpl-3.0.md"
+MKIT_STUB_LICENSES[FDLv1.3]="http://www.gnu.org/licenses/fdl-1.3.md"
+MKIT_STUB_LICENSES[FDLv1.2]="http://www.gnu.org/licenses/old-licenses/fdl-1.2.md"
+MKIT_STUB_LICENSES[FDLv1.1]="http://www.gnu.org/licenses/old-licenses/fdl-1.1.md"
 
 
 deploy() {
     local file=$1       # which known file?
     local any_name=${NiceName:-$PackageName}
     local tmp
-    tmp=$(mktemp -t newstub.deploy.XXXXXXX)
+    tmp=$(mktemp -t mkit.stub.deploy.XXXXXXX)
     mkdir -p "$(dirname "$file")"
     case $file in
 
@@ -132,10 +132,10 @@ deploy() {
             echo ''
             echo 'BuildArch:	noarch'
             echo 'BuildRequires:	coreutils git'
-            echo 'Requires:	MKIT_NEWSTUB_REQUIRES'
+            echo 'Requires:	MKIT_STUB_REQUIRES'
             echo ''
             echo '%description'
-            echo 'MKIT_NEWSTUB_DESCRIPTION'
+            echo 'MKIT_STUB_DESCRIPTION'
             echo ''
             echo '%prep'
             echo '%setup -q'
@@ -147,7 +147,7 @@ deploy() {
             echo '%make_install'
             echo ''
             echo '%files'
-            echo 'MKIT_NEWSTUB_FILELIST'
+            echo 'MKIT_STUB_FILELIST'
             echo ''
             echo '%changelog'
             echo ''
@@ -169,9 +169,9 @@ deploy() {
             echo ''
             echo 'Package: __MKIT_PROJ_PKGNAME__'
             echo 'Architecture: all'
-            echo 'Depends: MKIT_NEWSTUB_REQUIRES'
+            echo 'Depends: MKIT_STUB_REQUIRES'
             echo 'Description: __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__'
-            echo ' MKIT_NEWSTUB_DESCRIPTION'
+            echo ' MKIT_STUB_DESCRIPTION'
             echo ''
             echo '# control file built with MKit __MKIT_SELF_VERSION__'
             ;;
@@ -209,7 +209,7 @@ deploy() {
             ;;
 
         packaging/debian/*.install)
-            echo MKIT_NEWSTUB_FILELIST
+            echo MKIT_STUB_FILELIST
             ;;
 
         src/*.skel)
@@ -219,7 +219,7 @@ deploy() {
 
         LICENSE.md)
             local url   # license URL
-            url="${MKIT_INIT_LICENSES[$License]}"
+            url="${MKIT_STUB_LICENSES[$License]}"
             curl -sf "$url" \
              || die "failed to download license: $url"
             ;;
@@ -227,13 +227,13 @@ deploy() {
         .mkit/autoclean)
             ;;
 
-        MKIT_NEWSTUB_README.md)
+        MKIT_STUB_README.md)
             echo "FINISHING MKIT CONFIGURATION"
             echo "============================"
             echo ""
             echo "Congratulations, your new project has been configured!"
             echo ""
-            echo "However, the *newstub* script is not able to figure out"
+            echo "However, the *stub* script is not able to figure out"
             echo "everything, so few things still need to be done manually."
             echo "This document will guide you throught the rest of the"
             echo "process."
@@ -291,17 +291,17 @@ deploy() {
             echo "Placeholders"
             echo "------------"
             echo ""
-            echo "At places where *newstub* script did not have way to get all"
+            echo "At places where *stub* script did not have way to get all"
             echo "information automatically, it has inserted placeholders."
             echo "You will need to go through all of these placeholders and"
             echo "replace them with proper data."
             echo ""
             echo "Please follow instructions:"
             echo ""
-            echo " 1. Look for placeholders starting with \`MKIT_NEWSTUB_\`"
+            echo " 1. Look for placeholders starting with \`MKIT_STUB_\`"
             echo "    prefix by calling this command:"
             echo ""
-            echo "        grep -lw MKIT_NEWSTUB_ -r"
+            echo "        grep -lw MKIT_STUB_ -r"
             echo ""
             echo " 2. Go through each file and locate the placeholder.  (You"
             echo "    will also see placeholders like \`__MKIT_*__\`, you can"
@@ -309,13 +309,13 @@ deploy() {
             echo ""
             echo " 3. Replace placeholder with appropriate information:"
             echo ""
-            echo "     *  \`MKIT_NEWSTUB_REQUIRES\` - Requirements of your"
+            echo "     *  \`MKIT_STUB_REQUIRES\` - Requirements of your"
             echo "        project."
             echo ""
-            echo "     *  \`MKIT_NEWSTUB_DESCRIPTION\` - Description of your"
+            echo "     *  \`MKIT_STUB_DESCRIPTION\` - Description of your"
             echo "        project (few sentences to paragraphs)."
             echo ""
-            echo "     *  \`MKIT_NEWSTUB_FILELIST\` - List of full paths to"
+            echo "     *  \`MKIT_STUB_FILELIST\` - List of full paths to"
             echo "        your files after installation."
             echo ""
             echo "    Refer to these documents for further details:"
@@ -412,7 +412,7 @@ deploy() {
             echo "Makefile"
             echo "--------"
             echo ""
-            echo "*newstub* script also created a Makefile for you, but all"
+            echo "*stub* script also created a Makefile for you, but all"
             echo "it really does is include MKit's own mkit.mk, which in turn"
             echo "only maps \`make\` targets to actual mkit script calls."
             echo "Unless your project already uses GNU Make, you should not"
@@ -426,7 +426,7 @@ deploy() {
             echo "---------"
             echo ""
             echo "Each serious project needs a serious README.  Which is why"
-            echo "*newstub* has created a 'stub' of one for you."
+            echo "*stub* has created a 'stub' of one for you."
             fi
 
             echo ""
@@ -445,7 +445,7 @@ deploy() {
 known_licenses() {
     local key
     local first=true
-    for key in "${!MKIT_INIT_LICENSES[@]}"; do
+    for key in "${!MKIT_STUB_LICENSES[@]}"; do
         $first && echo "$key"  && continue
         echo ", $key"
     done
@@ -454,9 +454,9 @@ known_licenses() {
 usage() {
     {
         echo "Usage:"
-        echo "   newstub [options] new PKGNAME"
-        echo "   newstub [options] update"
-        echo "   newstub -L"
+        echo "   stub [options] new PKGNAME"
+        echo "   stub [options] update"
+        echo "   stub -L"
         echo ""
         echo "Options:"
         echo ""
@@ -514,7 +514,7 @@ mkcommit_backup() {
      || { warn "nothing to back up"; return 0; }
     git add .                           || return
     git rm -r --cached utils/mkit       || return
-    git commit -m "WIP [mkit/newstub] backup"   || return
+    git commit -m "WIP [mkit/stub] backup"   || return
 }
 
 mkcommit_mkit_code() {
@@ -522,7 +522,7 @@ mkcommit_mkit_code() {
       | grep -q -e '^utils/mkit$' -e '^utils/mkit/' \
      || return 0
     git add utils/mkit                                         || return
-    git commit -m "WIP [mkit/newstub] Add MKit version v$MKIT_VERSION" || return
+    git commit -m "WIP [mkit/stub] Add MKit version v$MKIT_VERSION" || return
 }
 
 mkcommit_mkit_conf() {
@@ -532,7 +532,7 @@ mkcommit_mkit_conf() {
         new)    msg="Add MKit configuration stub" ;;
         update) msg="Update MKit configuration"   ;;
     esac
-    git commit -m "WIP [mkit/newstub] $msg" || return
+    git commit -m "WIP [mkit/stub] $msg" || return
 }
 
 deploy_packaging() {
@@ -629,7 +629,7 @@ main() {
     local MkPackaging=true  # create packaging templates?
     local MkLicense=false   # create LICENSE.md file
     local Action            # 'update' to respect existing, 'new' to force
-                            # rewrite incl. MKIT_NEWSTUB_* placeholders
+                            # rewrite incl. MKIT_STUB_* placeholders
     declare -A UserGave
     while true; do case $1 in
         -n) NiceName=$2;   UserGave[NiceName]=1;   shift 2 || usage ;;
@@ -681,9 +681,9 @@ main() {
         mkcommit_mkit_code || die "failed creating post-commit"
         mkcommit_mkit_conf || die "failed creating post-commit"
     fi
-    deploy MKIT_NEWSTUB_README.md
+    deploy MKIT_STUB_README.md
     warn "Configuration stub built, follow instructions in"
-    warn "MKIT_NEWSTUB_README.md to finish configuration."
+    warn "MKIT_STUB_README.md to finish configuration."
     return 0
 }
 

utils/import-patches.sed

@@ -9,7 +9,7 @@
 
 /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/include:src/include:g
 /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/make:src/make.skel:g
-/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/newstub:src/newstub:g
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/stub:src/stub:g
 /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/mkit.mk:src/mkit.mk:g
 /^index /           s:100755$:100644:
 /^.MKIT_VERSION=/   s:MKIT_VERSION=.*$:MKIT_VERSION=__MKIT_PROJ_VERSION__: