From: Armaan Bhojwani <me@armaanb.net>
Date: Wed, 31 Mar 2021 15:47:42 +0000 (-0400)
Subject: kiss-serv: updates, bugfixes
X-Git-Tag: 2021.07.15-1~155
X-Git-Url: https://git.armaanb.net/?p=asd-repo.git;a=commitdiff_plain;h=1e19b648a53269a3df7ed0336f987ba3b0e1b21e

kiss-serv: updates, bugfixes
---

diff --git a/kiss-serv/checksums b/kiss-serv/checksums
index 499c41e..22dd18b 100644
--- a/kiss-serv/checksums
+++ b/kiss-serv/checksums
@@ -1,2 +1,2 @@
-2117150c3c1361a2d6e6d35d455a6772401b4c4a643d6171720e39f7e0d2ae15
-8fc4f646db823150c76ff84c4648f261376263de512934ecd325703aad61e9f4
+ab642b01282ce92aba462be2a579adb4691dc7c316ced87b7af55b928d6ea381
+0473fcb2d926b00521761ee2ead683c30778a44017ff0fb1895d31dd91ef51eb
diff --git a/kiss-serv/depends b/kiss-serv/depends
index c587eb2..d245e27 100644
--- a/kiss-serv/depends
+++ b/kiss-serv/depends
@@ -1,2 +1,2 @@
-ssh
+openssh
 rsync
diff --git a/kiss-serv/files/kiss-send-build b/kiss-serv/files/kiss-send-build
index 72c3d84..f819dc0 100755
--- a/kiss-serv/files/kiss-send-build
+++ b/kiss-serv/files/kiss-send-build
@@ -35,16 +35,17 @@ sshexec() {
 }
 
 get() {
-  contents=$sshcmd 'ls -1 ~/.cache/kiss/bin/'
-  pkg=$(echo $contents | sort | grep -m 1 "$2")
-  rsync -azre "ssh -p $sshcmd" "$user"@"$host":/home/"$user"/.cache/kiss/bin/"$pkg" \
+  pkg=$($sshcmd 'ls -1 ~/.cache/kiss/bin/' | sort | grep -m 1 "$2")
+  rsync -azre "ssh -p $port" "$user@$host":/home/"$user"/.cache/kiss/bin/"$pkg" \
     ~/.cache/kiss/bin
+  echo "fetched $pkg from $host"
+  exit
 }
 
 port=${KISS_SERV_PORT:-22}
 host=${KISS_SERV_HOST:-localhost}
 user=${KISS_SERV_USER:-$(whoami)}
-sshcmd="ssh -p $port $user@$host"
+sshcmd="ssh -p $port $user@$host env KISS_PATH=$KISS_PATH"
 
 while [ "$1" != "" ]; do
   case $1 in
@@ -52,10 +53,7 @@ while [ "$1" != "" ]; do
       usage
       exit
       ;;
-    build)
-      build "$@"
-      ;;
-    status | get)
+    status | build)
       sshexec "$@"
       ;;
     get)
diff --git a/kiss-serv/files/kiss-serv b/kiss-serv/files/kiss-serv
index 4943b1a..e9f753f 100755
--- a/kiss-serv/files/kiss-serv
+++ b/kiss-serv/files/kiss-serv
@@ -11,14 +11,16 @@ parse_err() {
 }
 
 build() {
-  kiss build $2
+  nohup sh -c "yes | kiss build $2" &
+  exit
 }
 
 status() {
   echo "built packages:"
   ls -1 ~/.cache/kiss/bin
-  echo "running kiss proceses:"
-  pgrep -a kiss
+  echo "\nrunning kiss proceses:"
+  pgrep -fa kiss
+  exit
 }
 
 sshcmd="ssh -p ${KISS_SERV_PORT:-22} ${KISS_SERV_HOST:-localhost}"
diff --git a/kiss-serv/version b/kiss-serv/version
index a383ea1..4d544ed 100644
--- a/kiss-serv/version
+++ b/kiss-serv/version
@@ -1 +1 @@
-git 1
+0.0.0 1