From 9da17d23546262f9861a78c28d560e40c2d64f3f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Sat, 18 Jul 2020 11:54:08 -0300
Subject: [PATCH] qi: Bump to version 2.0 (Release Candidate 12)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 qi/CREDITS                       |  2 +-
 qi/Makefile                      |  2 +-
 qi/NEWS                          |  2 +-
 qi/doc/qi.1                      |  2 +-
 qi/doc/qi.html                   |  8 ++--
 qi/doc/qi.info                   |  4 +-
 qi/doc/qi.texi                   |  4 +-
 qi/src/qi.in                     | 84 +++++++++++++++++++---------------------
 recipes/tools/qi/recipe          |  2 +-
 sources/SOURCELIST.txt           |  2 +-
 sources/qi-2.0rc11.tar.lz.sha256 |  1 -
 sources/qi-2.0rc12.tar.lz.sha256 |  1 +
 12 files changed, 55 insertions(+), 59 deletions(-)
 delete mode 100644 sources/qi-2.0rc11.tar.lz.sha256
 create mode 100644 sources/qi-2.0rc12.tar.lz.sha256
diff --git a/qi/CREDITS b/qi/CREDITS
index 74898237..2982947d 100644
--- a/qi/CREDITS
+++ b/qi/CREDITS
@@ -18,7 +18,7 @@ S: Spain
 
 N: Alan Beadle
 E: ab.beadle@gmail.com
-D: Correctness and suggestions in English messages.
+D: Correctness and suggestions for English messages.
 S: USA
 
 N: Eduardo A. Bustamante Lopez
diff --git a/qi/Makefile b/qi/Makefile
index cd17aa7e..b33948dc 100644
--- a/qi/Makefile
+++ b/qi/Makefile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 project		= qi
-version		= 2.0rc11
+version		= 2.0rc12
 
 ## DO NOT MAKE CHANGES HERE.
 #
diff --git a/qi/NEWS b/qi/NEWS
index 3738d691..98be68f7 100644
--- a/qi/NEWS
+++ b/qi/NEWS
@@ -1,6 +1,6 @@
 2020-07-??  Matias Fonzo  <selk@dragora.org>
 
-    * Bump to version 2.0rc11.
+    * Bump to version 2.0rc12.
 
     * Version 2.0 (stable to be released).
 
diff --git a/qi/doc/qi.1 b/qi/doc/qi.1
index 018e9551..10c7e279 100644
--- a/qi/doc/qi.1
+++ b/qi/doc/qi.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH QI "1" "July 2020" "qi 2.0rc11" "User Commands"
+.TH QI "1" "July 2020" "qi 2.0rc12" "User Commands"
 .SH NAME
 qi \- a simple but well-integrated package manager
 .SH SYNOPSIS
diff --git a/qi/doc/qi.html b/qi/doc/qi.html
index e8bcd3a9..fc01ccd0 100644
--- a/qi/doc/qi.html
+++ b/qi/doc/qi.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<!-- This user guide is for Qi (version 2.0rc11,
-16 Jul 2020), which is a simple but well-integrated package manager.
+<!-- This user guide is for Qi (version 2.0rc12,
+18 Jul 2020), which is a simple but well-integrated package manager.
 
 Copyright (C) 2019-2020 Matias Andres Fonzo, Santiago del Estero,
 Argentina.
@@ -108,8 +108,8 @@ Next: <a href="#Introduction" accesskey="n" rel="next">Introduction</a>, Up: <a
 </div>
 <a name="SEC_Top"></a>
 
-<p>This user guide is for Qi (version 2.0rc11,
-16 Jul 2020).
+<p>This user guide is for Qi (version 2.0rc12,
+18 Jul 2020).
 </p>
 <table class="menu" border="0" cellspacing="0">
 <tr><td align="left" valign="top">&bull; <a href="#Introduction" accesskey="1">Introduction</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">Description and features of qi
diff --git a/qi/doc/qi.info b/qi/doc/qi.info
index 3b257c78..ba126a8a 100644
--- a/qi/doc/qi.info
+++ b/qi/doc/qi.info
@@ -1,6 +1,6 @@
 This is qi.info, produced by makeinfo version 6.5 from qi.texi.
 
-This user guide is for Qi (version 2.0rc11, 16 Jul 2020), which is a
+This user guide is for Qi (version 2.0rc12, 18 Jul 2020), which is a
 simple but well-integrated package manager.
 
    Copyright © 2019-2020 Matias Andres Fonzo, Santiago del Estero,
@@ -23,7 +23,7 @@ File: qi.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Qi user guide
 *************
 
-This user guide is for Qi (version 2.0rc11, 16 Jul 2020).
+This user guide is for Qi (version 2.0rc12, 18 Jul 2020).
 
 * Menu:
 
diff --git a/qi/doc/qi.texi b/qi/doc/qi.texi
index 9225a060..73093e90 100644
--- a/qi/doc/qi.texi
+++ b/qi/doc/qi.texi
@@ -7,8 +7,8 @@
 @syncodeindex pg cp
 @comment %**end of header
 
-@set VERSION 2.0rc11
-@set UPDATED 16 Jul 2020
+@set VERSION 2.0rc12
+@set UPDATED 18 Jul 2020
 
 @copying
 This user guide is for Qi (version @value{VERSION},
diff --git a/qi/src/qi.in b/qi/src/qi.in
index 23f8cb16..5bd5d425 100644
--- a/qi/src/qi.in
+++ b/qi/src/qi.in
@@ -663,7 +663,7 @@ mode_create()
     name="$(_basename "$1")"
 
     echo ""
-    echo "{#} Creating package name \"${name}\" ..."
+    echo "{#} Creating package name \`${name}' ..."
 
     if test "$name" = "${name%.tlz}"
     then
@@ -691,7 +691,7 @@ mode_remove()
     expunge="${packagedir}/$(_basename "$1" .tlz)"
 
     echo ""
-    echo "<<< Removing package \"$rootdir${expunge}\" ..."
+    echo "<<< Removing package \`$rootdir${expunge}' ..."
 
     # Complain if the package directory does not exist
 
@@ -738,7 +738,6 @@ mode_remove()
     if test "$opt_keep" != opt_keep
     then
         echo "=== Deleting package directory, if exists as such ..."
-
         if test -e "${rootdir}$expunge"
         then
             rm -r -- "${rootdir}$expunge" || chkstatus_or_exit
@@ -758,7 +757,7 @@ mode_remove()
 mode_install()
 {
     echo ""
-    echo ">>> Installing package \"${1}\" ..."
+    echo ">>> Installing package \`${1}' ..."
 
     # Complain if the package cannot be well-read
 
@@ -781,18 +780,21 @@ mode_install()
     tarlz --missing-crc -tf "$1" > /dev/null
     chkstatus_or_exit 3
 
+    # To accept random directory from the upgrade mode
+    _packagedir="${_packagedir:=$packagedir}"
+
     # Create package directory using 'name'
-    if ! test -d "$rootdir${packagedir}/$name"
+    if ! test -d "$rootdir${_packagedir}/$name"
     then
-        mkdir -p -- "$rootdir${packagedir}/$name" || chkstatus_or_exit
-        echo "mkdir: created directory '$rootdir${packagedir}/$name'"
+        mkdir -p -- "$rootdir${_packagedir}/$name" || chkstatus_or_exit
+        echo "mkdir: created directory '$rootdir${_packagedir}/$name'"
     fi
 
     # Scan for possible conflicts, stop if arise
     if test "$opt_prune" != opt_prune
     then
         echo "=== Checking for possible conflicts ..."
-        if graft -i -n $graft_r -t "$targetdir" "${packagedir}/$name" 2>&1 | \
+        if graft -i -n $graft_r -t "$targetdir" "${_packagedir}/$name" 2>&1 | \
          grep ^CONFLICT
         then
             warn "" \
@@ -805,8 +807,8 @@ mode_install()
     # Ignore some signals up to completing the installation
     trap "" HUP INT QUIT ABRT TERM
 
-    echo "=== Decompressing $1 ..."
-    ( cd -- "$rootdir${packagedir}/$name" && tarlz -xf - ) < "$1"
+    echo "=== Decompressing package ..."
+    ( cd -- "$rootdir${_packagedir}/$name" && tarlz -xf - ) < "$1"
     chkstatus_or_exit 3
 
     # Transite package to Graft control
@@ -814,11 +816,11 @@ mode_install()
     # Remove objects (files, links or directories) from the target
     # directory that are in conflict with the package directory
     echo "=== Pruning any conflict ..."
-    graft -p -D -u $graft_r -t "$targetdir" "${packagedir}/$name"
+    graft -p -D -u $graft_r -t "$targetdir" "${_packagedir}/$name"
     chkstatus_or_exit 2
 
     echo "=== Enabling symbolic links ..."
-    graft -i -P $graft_v $graft_r -t "$targetdir" "${packagedir}/$name"
+    graft -i -P $graft_v $graft_r -t "$targetdir" "${_packagedir}/$name"
     chkstatus_or_exit 2
 
     # Avoid unnecessary runs coming from the upgrade mode,
@@ -827,9 +829,9 @@ mode_install()
     if test "$_isUpgrade" != _isUpgrade.on
     then
         # Show package description
-        if test -r "$rootdir${packagedir}/${name}/var/lib/qi/${name}.txt"
+        if test -r "$rootdir${_packagedir}/${name}/var/lib/qi/${name}.txt"
         then
-            awk '/^#/' "$rootdir${packagedir}/${name}/var/lib/qi/${name}.txt"
+            awk '/^#/' "$rootdir${_packagedir}/${name}/var/lib/qi/${name}.txt"
         elif test -r "${1}.txt"
         then
             # From external meta file (current directory)
@@ -839,22 +841,22 @@ mode_install()
         fi
 
         # Check and run the post-install script if exist
-        if test -r "$rootdir${packagedir}/${name}/var/lib/qi/${name}.sh"
+        if test -r "$rootdir${_packagedir}/${name}/var/lib/qi/${name}.sh"
         then
             echo "=== Running post-install script for \`${name}' ..."
             (
                 # Rely on 'targetdir' if 'rootdir' is empty
                 cd -- "${rootdir:=$targetdir}"/ && \
-                 . "$rootdir${packagedir}/${name}/var/lib/qi/${name}.sh"
+                 . "$rootdir${_packagedir}/${name}/var/lib/qi/${name}.sh"
             )
         fi
 
         # Check if there are declared packages for replacement
-        if test -r "$rootdir${packagedir}/${name}/var/lib/qi/${name}.replace"
+        if test -r "$rootdir${_packagedir}/${name}/var/lib/qi/${name}.replace"
         then
             while read -r line
             do
-                for replace in "$rootdir${packagedir}/$(pkgbase "$line")"_*
+                for replace in "$rootdir${_packagedir}/$(pkgbase "$line")"_*
                 do
                     if ! test -e "$replace"
                     then
@@ -882,9 +884,9 @@ mode_install()
                     graft -d -D -u $graft_r \
                      -t "$targetdir" "$replace" > /dev/null 2>&1
 
-                    rm -rf -- "$rootdir${packagedir}/$replace"
+                    rm -rf -- "$rootdir${_packagedir}/$replace"
                 done
-            done < "$rootdir${packagedir}/${name}/var/lib/qi/${name}.replace"
+            done < "$rootdir${_packagedir}/${name}/var/lib/qi/${name}.replace"
             unset line
         fi
     fi
@@ -893,7 +895,7 @@ mode_install()
     trap - HUP INT QUIT ABRT TERM
 
     # Remove used variables
-    unset name
+    unset name _packagedir
 
     echo ""
 }
@@ -936,7 +938,7 @@ mode_upgrade()
     incoming="$(_basename "$1" .tlz)"
 
     echo ""
-    echo "{%} Upgrading package \"${incoming}\" ..."
+    echo "{%} Upgrading package \`${incoming}' ..."
 
     # Check package pre-existence
     if test "$opt_force" != opt_force && \
@@ -959,8 +961,7 @@ mode_upgrade()
             warn \
              "Package name declared on the blacklist \"${incoming}\"."      \
              ""                                                             \
-             "  This package will be INSTALLED instead of being upgraded."  \
-             ""
+             "  This package will be INSTALLED instead of being upgraded."
              opt_prune=opt_prune mode_install "$1"
              return 0
             ;;
@@ -968,25 +969,16 @@ mode_upgrade()
     done
     unset item
 
-    # Prepare the package to install it in a temporary location
+    # Prepare the package to install it in a temporary but custom location
 
-    # Set random directory using packagedir as prefix and 'incoming' as suffix
+    # Set random directory under 'rootdir/packagedir' using 'incoming' as name
     PRVLOC=$(mktemp -dp "$rootdir${packagedir}" ${incoming}.XXXXXXXXXXXX) || exit 2
 
-    # Pre-install the package in the custom 'packagedir'
-
-    save_packagedir="$rootdir${packagedir}"
-    packagedir="$PRVLOC"
-
-    echo "=== Pre-installing package in a temporary location ..."
+    echo "=== Pre-installing package in temporary location ..."
     opt_prune=opt_prune		# Turn on prune operation.
-    _isUpgrade=_isUpgrade.on mode_install "$1" > /dev/null
+    _isUpgrade=_isUpgrade.on mode_install "$1" "$PRVLOC" > /dev/null
     _isUpgrade=_isUpgrade.off
 
-    # Restore variable before looking for old packages
-    packagedir=$save_packagedir
-    unset save_packagedir
-
     echo "=== Looking for installations under the same name ..."
     for long_name in "$rootdir${packagedir}/$(pkgbase "$incoming")"*
     do
@@ -1060,8 +1052,8 @@ mode_extract()
 
     name="$(_basename "$1" .tlz)"
 
-    # Set random directory using 'name' as prefix
-    PRVDIR="${TMPDIR}/${name}.${RANDOM-0}$$"
+    # Set random directory under 'TMPDIR' using 'name'
+    PRVDIR=$(mktemp -dp "$TMPDIR" ${name}.XXXXXXXXXXXX) || exit 2
 
     # Trap to remove 'PRVDIR' on disruptions
     trap 'rm -rf -- "$PRVDIR"' HUP INT ABRT TERM
@@ -1072,7 +1064,7 @@ mode_extract()
     chmod 700 -- "$PRVDIR"
 
     echo ""
-    echo "--- Extracting package $name ..."
+    echo "--- Extracting package \`${name}' ..."
 
     ( umask 000 ; cd -- "$PRVDIR" && tarlz -xvf - ) < "$1"
     if test $? -ne 0
@@ -1243,7 +1235,7 @@ QI_WORKTREE=$worktree
 QI_TARDIR=$tardir
 QI_OUTDIR=$outdir
 
-### Parse modes and options
+### Parse commands and options
 
 _validate_mode()
 {
@@ -1301,6 +1293,10 @@ _validate_digit()
 while test $# -gt 0
 do
     case $1 in
+    warn)
+        _validate_mode warn
+        mode=mode_warn
+        ;;
     install)
         _validate_mode install
         readconfig
@@ -1595,8 +1591,7 @@ if test -n "$rootdir"
 then
     if test -d "$rootdir" && test "$rootdir" != /
     then
-        # Remove slash from the end
-        rootdir="${rootdir%/}"
+        rootdir="${rootdir%/}"	# Remove slash from the end.
 
         # A workaround for graft-2.13+.  The specified directory is
         # relative to the log file, we prepend it inside 'rootdir'
@@ -1613,6 +1608,7 @@ then
         warn "${PROGRAM}: Root directory \`${rootdir}' is not fully qualified"
         exit 4
     fi
+    readonly rootdir
     export rootdir
 fi
 
@@ -1622,7 +1618,7 @@ if test ! -d "$TMPDIR"
 then
     mkdir -p -- "$TMPDIR" || chkstatus_or_exit
 fi
-readonly TMPDIR
+readonly TMPDIR packagedir targetdir
 
 # Process each package or recipe provided on the command-line
 
diff --git a/recipes/tools/qi/recipe b/recipes/tools/qi/recipe
index d15b4312..38b3621a 100644
--- a/recipes/tools/qi/recipe
+++ b/recipes/tools/qi/recipe
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 program=qi
-version=2.0rc11
+version=2.0rc12
 arch=noarch
 release=1
 
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index abd5d32b..b2a10e5f 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -247,7 +247,7 @@ http://rsync.dragora.org/current/sources/tint2-20190714_7831350.tar.lz
 http://rsync.dragora.org/current/sources/udevil-20150504_ce9f1c5.tar.lz
 http://rsync.dragora.org/current/sources/xdg-utils-20190413_0547886.tar.lz
 http://rsync.dragora.org/current/sources/xorg-xf86-video-intel-20190927_c6cb1b19.tar.lz
-http://rsync.dragora.org/v3/sources/qi-2.0rc11.tar.lz
+http://rsync.dragora.org/v3/sources/qi-2.0rc12.tar.lz
 http://rubygems.org/downloads/asciidoctor-2.0.10.gem
 http://savannah.c3sl.ufpr.br/libpipeline/libpipeline-1.5.1.tar.gz
 http://sethwklein.net/iana-etc-2.30.tar.bz2
diff --git a/sources/qi-2.0rc11.tar.lz.sha256 b/sources/qi-2.0rc11.tar.lz.sha256
deleted file mode 100644
index 17c0f478..00000000
--- a/sources/qi-2.0rc11.tar.lz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-6f8621f05dae1af328656a68ba55bd9918c825078f64cb40c0ee6a3460b7d0d8  qi-2.0rc11.tar.lz
diff --git a/sources/qi-2.0rc12.tar.lz.sha256 b/sources/qi-2.0rc12.tar.lz.sha256
new file mode 100644
index 00000000..b6d3cd5b
--- /dev/null
+++ b/sources/qi-2.0rc12.tar.lz.sha256
@@ -0,0 +1 @@
+b3120bf994f253af97e2a62e76608a1d746e275fe8718e33c9b8a3e61d9fb71a  qi-2.0rc12.tar.lz
-- 
2.11.4.GIT

