cpt

[ARCHIVED] Carbs Packaging Tools
git clone git://git.ckyln.com/~cem/cpt.git
Log | Files | Refs | README | LICENSE

commit 290d11092a3bd54877fdf070ead2ca7878884596
parent 9bb2c8bee1563475df3942a11807e6f8d3702e34
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Tue, 18 Feb 2020 21:14:49 +0200

kiss: y/n prompts and view package build file feature

Diffstat:
Mkiss | 53++++++++++++++++++++++++++++++++++-------------------
1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/kiss b/kiss @@ -39,14 +39,26 @@ contains() { case " $1 " in *" $2 "*) return 0; esac; return 1 } -prompt() { - # Ask the user for some input. - log "Continue?: Press Enter to continue or Ctrl+C to abort here" - - # POSIX 'read' has none of the "nice" options like '-n', '-p' - # etc etc. This is the most basic usage of 'read'. - # '_' is used as 'dash' errors when no variable is given to 'read'. - read -r _ +yn() { + log "${1:-Continue?} (y/n)" + + # Enable raw input to allow for a single byte to be read from + # stdin without needing to wait for the user to press Return. + stty -icanon -echo + + # Read a single byte from stdin using 'dd'. POSIX 'read' has + # no support for single/'N' byte based input from the user. + answer=$(dd ibs=1 count=1 2>/dev/null) + + # Disable raw input, leaving the terminal how we *should* + # have found it. + stty icanon echo + + # Handle the answer here directly, enabling this function's + # return status to be used in place of checking for '[yY]' + # throughout this program. Also call the function again if + # invalid input is given. + case $answer in y) ;; n) return 1 ;; *) yn "$1"; esac } as_root() { @@ -526,7 +538,7 @@ pkg_build() { log "Building: $*" # Only ask for confirmation if more than one package needs to be built. - [ $# -gt 1 ] || [ "$pkg_update" ] && prompt + [ $# -gt 1 ] || [ "$pkg_update" ] && yn log "Checking to see if any dependencies have already been built" log "Installing any pre-built dependencies" @@ -560,6 +572,13 @@ pkg_build() { pkg_verify "$@" + # Allow user to inspect package files prior to build. + [ "$KISS_AUDIT" != 1 ] || + for pkg; do + yn "View build file for $pkg?" && + "${EDITOR:-vi}" "$(pkg_find "$pkg")/build" + done + # Finally build and create tarballs for all passed packages and # dependencies. for pkg; do @@ -643,13 +662,9 @@ pkg_build() { set -- $explicit # Only ask for confirmation if more than one package needs to be installed. - [ $# -gt 1 ] && { - log "Install built packages? [$*]" - - prompt && { - args i "$@" - return - } + [ $# -gt 1 ] && yn "Install built packages? [$*]" && { + args i "$@" + return } log "Run 'kiss i $*' to install the package(s)" @@ -730,8 +745,8 @@ pkg_conflicts() { # Enable alternatives automatically if it is safe to do so. # This checks to see that the package that is about to be installed # doesn't overwrite anything it shouldn't in '/var/db/kiss/installed'. - "$grep" -Fxf "$cac_dir/$pid-m" -- "$@" | - "$grep" -q ":/var/db/kiss/installed/" || choice_auto=1 + "$grep" -Fxf "$cac_dir/$pid-m" -- "$@" | + "$grep" -q ":/var/db/kiss/installed/" || choice_auto=1 # Use 'grep' to list matching lines between the to # be installed package's manifest and the above filtered @@ -1146,7 +1161,7 @@ pkg_updates() { log "Detected package manager update" log "The package manager will be updated first" - prompt + yn pkg_build kiss args i kiss