zsh: update

.config/zsh/alias/containers.zsh

@@ -12,19 +12,19 @@ alias pod-logs='podman logs '
 sko-inspect() {
     local i
     i="${1:?}" ; shift
-    command skopeo inspect "docker://$i" "$@"
+    command skopeo inspect "$@" "docker://$i"
 }
 
 sko-list-tags() {
     local i
     i="${1:?}" ; shift
-    command skopeo list-tags "docker://$i" "$@"
+    command skopeo list-tags "$@" "docker://$i"
 }
 
 pod-dive() {
     local i
     i="${1:?}" ; shift
-    command dive "podman://$i" "$@"
+    command dive "$@" "podman://$i"
 }
 
 jq-visual() {

.config/zsh/alias/gpg.zsh

@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 gpg-warmup() {
-    (( ${+commands[gpg]} )) || return 1
+    (( ${+commands[gpg]} )) || return 127
 
     local t r
 

.config/zsh/alias/idle.zsh

@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 idle() {
-    [ -n "${1:?}" ] || return 1
+    [ -n "${1:?}" ]
 
     local f
 
@@ -17,7 +17,7 @@ idle() {
 }
 
 z-idle-ext() {
-    [ -n "${1:?}" ] || return 1
+    [ -n "${1:?}" ]
 
     local -a s
 
@@ -28,7 +28,7 @@ z-idle-ext() {
 }
 
 z-idle-int() {
-    [ -n "${1:?}" ] || return 1
+    [ -n "${1:?}" ]
 
     ## execute in subshell
     (

.config/zsh/alias/kconfig.zsh

@@ -1,24 +1,22 @@
 #!/bin/zsh
 
 kconf-set() {
-    [ -n "${1:?}" ] || return 1
-
-    local n=$1 v=$2
+    local n v
+    n="${1:?}" v=$2
     shift 2
 
-    [ $# -gt 0 ] || return 2
+    [ $# -gt 0 ] || return 1
 
     command grep -ElZ "^((CONFIG_)?$n=|# (CONFIG_)?$n is not set)" "$@" \
     | xargs -0 -r sed -i -E -e "s/^(((CONFIG_)?$n)=.+|# ((CONFIG_)?$n) is not set)\$/\\2\\4=$v/"
 }
 
 kconf-unset() {
-    [ -n "${1:?}" ] || return 1
-
-    local n=$1
+    local n
+    n="${1:?}"
     shift
 
-    [ $# -gt 0 ] || return 2
+    [ $# -gt 0 ] || return 1
 
     command grep -ElZ "^(CONFIG_)?$n=" "$@" \
     | xargs -0 -r sed -i -E -e "s/^((CONFIG_)?$n)=.+\$/# \\1 is not set/"

.config/zsh/alias/quilt.zsh

@@ -5,7 +5,7 @@ quilt-series-strip-comments() {
 }
 
 quilt-series-auto() {
-    [ -n "${1:?}" ] || return 1
+    [ -n "${1:?}" ]
 
     find "$1/" -follow -type f -printf '%P\0' \
     | sed -zEn '/\.(diff|patch)$/p' \
@@ -13,16 +13,16 @@ quilt-series-auto() {
 }
 
 krd-quilt() {
-    [ -n "${1:?}" ] || return 1
+    (( $+commands[quilt] )) || return 127
 
-    (( $+commands[quilt] )) || return 2
+    [ -n "${1:?}" ]
 
     local patchdir series tmp_series
 
     if [ -d "$1" ] ; then
         patchdir="$1/debian/patches"
         if [ -d "${patchdir}" ] ; then
-            [ -f "${patchdir}/series" ] || return 3
+            [ -f "${patchdir}/series" ] || return 1
         else
             patchdir="$1"
         fi
@@ -34,7 +34,7 @@ krd-quilt() {
             quilt-series-auto "${patchdir}" > "${series}"
         fi
     elif [ -f "$1" ] ; then
-        [ -s "$1" ] || return 3
+        [ -s "$1" ] || return 2
 
         series="$1"
         patchdir=${series:h}
@@ -53,7 +53,7 @@ krd-quilt() {
         command quilt pop -a ; echo
 
         r=0
-        while read -r i ; do
+        while read -rs i ; do
             [ -n "$i" ] || continue
 
             k="${patchdir}/$i"

.config/zsh/alias/sbuild.zsh

@@ -1,7 +1,9 @@
 #!/bin/zsh
 
 krd-debsrc() {
-    [ -n "${1:?}" ] || return 1
+    (( $+commands[deb-src-export] )) || return 127
+
+    [ -n "${1:?}" ]
 
     local dstdir
     case "$1" in
@@ -13,21 +15,21 @@ krd-debsrc() {
 }
 
 krd-sbuild() {
-    [ -n "${1:?}" ] || return 1
-    [ -n "${2:?}" ] || return 1
+    (( $+commands[sbuild] )) || return 127
+    (( $+commands[xz] ))     || return 127
 
-    (( $+commands[sbuild] )) || return 2
-    (( $+commands[xz] ))     || return 2
+    [ -n "${1:?}" ]
+    [ -n "${2:?}" ]
 
     local topdir
     case "$1" in
     */* ) topdir="$1" ;;
     * )   topdir="/tmp/$1" ;;
     esac
-    [ -d "${topdir}" ] || return 3
+    [ -d "${topdir}" ] || return 1
 
     local srcdir="${topdir}/src"
-    [ -d "${srcdir}" ] || return 3
+    [ -d "${srcdir}" ] || return 2
 
     arch="$2"