From 0037554001b751452c259127f919aeeb8e6b64ee Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 28 Nov 2016 13:51:53 +0000
Subject: [PATCH] scripts: Replace standard source path cvs.stable with jw.dev

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/build.py            |  2 +-
 scripts/integrate-distro.sh | 10 +++++-----
 scripts/jcs                 |  2 +-
 scripts/projects.py         |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index 706aab35..4602d1ba 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -19,7 +19,7 @@ import re
 all_deps = Set()
 dep_tree = {}
 glob_order = []
-proj_base=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/cvs.stable/proj"
+proj_base=pwd.getpwuid(os.getuid()).pw_dir + "/local/src/jw.dev/proj"
 search_path=[".", "dspc/src", "dspc/src/dspcd-plugins", "dspc/src/io" ]
 glob_prereq_type="BUILD"
 dep_cache = {}
diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 152ac5a1..4bd2dd2b 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -630,7 +630,7 @@ cfg_default()
 	/usr/share/syslinux  /srv/nfs/boot/pxe/bin auto      bind                  0 0
 
 	[jcs_conf]
-	jcs_dir=\$HOME/local/src/cvs.stable/conf/jannet.de/minimalix/suse-$suse_version
+	jcs_dir=\$HOME/local/src/jw.dev/conf/jannet.de/minimalix/suse-$suse_version
 	jcs_owner=root
 	jcs_group=root
 	jcs_log_dir=\$jcs_dir/log
@@ -824,11 +824,11 @@ kill_chroot_processes()
 	local wait
 	local p
 	for p in $pids; do
-		echo "killing process $pid (`strings /proc/$p/cmdline | sed ':a;N;$!ba;s/\n/ /g'`)"
-		kill $p
+		echo "killing process $p (`strings /proc/$p/cmdline | sed ':a;N;$!ba;s/\n/ /g'`)"
+		kill $p || continue
 		wait=1
 	done
-	[ wait = 1 ] && sleep 1
+	if [ "$wait" = 1 ]; then sleep 1; fi
 }
 
 unmount_devices()
@@ -842,7 +842,7 @@ unmount_devices()
 	for d in $devices; do
 		check_mount $d && {
 			[ "$sync" -a -e $root$d -a $d != $ssh_auth_sock ] && run $sync -f $root$d
-			[ "$d" = /dev ] && sleep 2 # need to do this, otherwise dev is busy, no idea why
+			#[ "$d" = /dev ] && sleep 2 # need to do this, otherwise dev is busy, no idea why
 			run umount $root$d
 		}
 	done
diff --git a/scripts/jcs b/scripts/jcs
index 2f8320c7..c42ebdeb 100644
--- a/scripts/jcs
+++ b/scripts/jcs
@@ -2031,7 +2031,7 @@ JNT_JCSDIR=/tmp
 --<<<-- jcs.conf.oldstyle --
 
 -->>>-- jcs.conf --
-jcs_dir=$HOME/local/src/cvs.stable/conf/`hostname -d`/`hostname -s`/`/opt/ytools/bin/get_os.sh`
+jcs_dir=$HOME/local/src/jw.dev/conf/`hostname -d`/`hostname -s`/`/opt/ytools/bin/get_os.sh`
 jcs_owner=root
 jcs_group=root
 jcs_log_dir=$jcs_dir/log
diff --git a/scripts/projects.py b/scripts/projects.py
index 78c5e653..6f42a15a 100644
--- a/scripts/projects.py
+++ b/scripts/projects.py
@@ -462,7 +462,7 @@ parser.add_argument('--debug', '-d', action='store_true',
     default=False, help='Output debug information to stderr')
 parser.add_argument('--topdir', '-t', nargs='?', help='Project Path')
 parser.add_argument('--prefix', '-p', nargs='?', default = expanduser("~") +
-    '/local/src/cvs.stable/proj', help='Projects Path Prefix')
+    '/local/src/jw.dev/proj', help='Projects Path Prefix')
 parser.add_argument('arg', nargs='*', help='Command arguments')
 args=parser.parse_args(global_args)