From cc084f654a9ecbe9864c7c0ee4f0afb82b8456c6 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Wed, 9 Sep 2020 13:58:00 +0300
Subject: [PATCH] kiss-fork: clean up

---
 contrib/kiss-fork | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/contrib/kiss-fork b/contrib/kiss-fork
index 62b9f10..e8df8ec 100755
--- a/contrib/kiss-fork
+++ b/contrib/kiss-fork
@@ -1,27 +1,30 @@
 #!/bin/sh -ef
 # Copy a package's repository files into the current directory
 
-# Ignore shellcheck as we want the warning's behavior.
-# shellcheck disable=2015
-[ "$1" ] && kiss search "${1:-null}" >/dev/null || {
+pkg=${1:-"${PWD##*/}"}
+num=$(printf %d "${2:-0}")
+
+dir=$(kiss search "$pkg" 2>/dev/null) || {
     printf 'usage: [kiss-fork [pkg]] [index]\n'
     exit 1
 }
 
-num=$2
+# Globbing is disabled and word splitting is intentional. 
+# shellcheck disable=2086
+set -- $dir
 
-# Disable this warning as globbing is disabled and word splitting
-# is intentional. This grabs the location of the package's files.
-# shellcheck disable=2046
-(
-    set -- $(kiss search "$1")
+[ "$num" -ge "$#" ] && {
+    printf 'index exceeds maximum\n'
+    exit 1 
+}
 
-    shift "${num:-0}"
+shift "$num"
 
-    [ -d "$1" ] && {
-        printf 'found package in %s\n' "$1"
-        cp -r "$1" .
-    }
-)
+[ "$1" ] || [ -d "$1" ] || {
+    printf 'failed to locate package\n'
+    exit 1
+}
 
-printf 'forked package to %s\n' "$PWD/$1"
+printf 'found  package in %s\n' "$1"
+cp -rf "$1" .
+printf 'forked package to %s\n' "$PWD/$pkg"