From ae2725516bcd6833b51bcad2fbcc0a7796fa9f6a Mon Sep 17 00:00:00 2001
From: "B. Wilson" <x@wilsonb.com>
Date: Mon, 3 Feb 2020 02:14:25 +0900
Subject: [PATCH] j: update jconsole wrapper script; update tests

---
 srcpkgs/j/template | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/j/template b/srcpkgs/j/template
index 3b047644df3..e47e045543e 100644
--- a/srcpkgs/j/template
+++ b/srcpkgs/j/template
@@ -4,7 +4,7 @@ _vmaj=901
 _vmin=e
 _vrel=${_vmaj}-release${_vmin:+-}${_vmin}
 version=${_vmaj}.${_vmin}
-revision=1
+revision=2
 archs="aarch64* x86_64*"
 wrksrc="jsource-j${_vrel}"
 makedepends="libedit-devel libgomp-devel libomp-devel"
@@ -29,20 +29,22 @@ aarch64*) _jpl="raspberry";;
 esac
 
 case "${XBPS_TARGET_MACHINE}" in
-*-musl)   makedepends+=" musl-fts-devel";;
+*-musl) makedepends+=" musl-fts-devel";;
 esac
 
 
 do_configure() {
-	sed "/jversion/s@${_vmaj}@${_vrel}@
-	     /jplatform/s@unknown@${_jpl}@
-	     /jtype/s@beta@${_jtype}@
-	     /jbuilder/s@unknown@${_jbuilder}@" \
-	    jsrc/jversion-x.h > jsrc/jversion.h
-
-	sed -i "/^install=./s@/usr/share/j/[0-9.]\+@${_jshare}@
-	        /^user=./s@home,userx@home,'/${_juser}'@" \
-	       jlibrary/bin/profile.ijs
+	cp jsrc/jversion-x.h jsrc/jversion.h
+	vsed -i "/jversion/s@${_vmaj}@${_vrel}@;
+	         /jplatform/s@unknown@${_jpl}@;
+	         /jtype/s@beta@${_jtype}@;
+	         /jbuilder/s@unknown@${_jbuilder}@" \
+	     jsrc/jversion.h
+
+	cp jlibrary/bin/profile.ijs jlibrary/bin/profile.ijs.new
+	vsed -i "/^install=./s@/usr/share/j/[0-9.]\+@${_jshare}@;
+	         /^user=./s@home,userx@home,'/${_juser}'@" \
+	     jlibrary/bin/profile.ijs.new
 }
 
 ##
@@ -72,10 +74,14 @@ do_check() {
 		javx=''
 	fi
 
-	ln -srf jlibrary/bin/* bin/${_jpl}/${_jsz}${javx}/
-	ln -srf jlibrary/{addons,system,tools} bin/${_jpl}/
+	mkdir -p test/bin
+	cp -r jlibrary/addons test/bin
+	cp -r jlibrary/system test/bin
+	cp -r jlibrary/tools test/bin
+	cp -r "bin/${_jpl}/${_jsz}${javx}" test/bin
+	cp jlibrary/bin/profile.ijs "test/bin/${_jsz}${javx}"
 
-	echo 'RECHO ddall' | "bin/${_jpl}/${_jsz}${javx}/jconsole" test/tsu.ijs
+	echo 'RECHO ddall' | "test/bin/${_jsz}${javx}/jconsole" test/tsu.ijs
 }
 
 ##
@@ -98,7 +104,7 @@ else
 	exit 1
 fi
 
-${_jlib}/${_jsz}\${javx}/jconsole -jprofile "${_jetc}/profile.ijs" "\${@}"
+exec ${_jlib}/${_jsz}\${javx}/jconsole -jprofile "${_jetc}/profile.ijs" "\${@}"
 JC
 }
 
@@ -112,7 +118,7 @@ do_install() {
 
 	vmkdir "${_jetc}" 0755
 	vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
-	vinstall "jlibrary/bin/profile.ijs" 644 "${_jetc}"
+	vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
 
 	_jconsole_wrapper_script >bin/jc.sh
 	vbin "bin/jc.sh" jc