Initscript update

5 files changed, 14 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffcf6d66586c..112eff51a694 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = soapui
 	pkgdesc = A graphical Java program for inspecting, invoking, monitoring, simulating/mocking and functional/load/compliance/surveillance testing of REST/WADL and SOAP/WSDL-based Web Services over HTTP.
 	pkgver = 5.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.soapui.org/
 	arch = i686
 	arch = x86_64
@@ -16,11 +16,11 @@ pkgbase = soapui
 	md5sums = 10be0158efbe3ab77eaf19c664454f03
 	md5sums = 3cc08aca62edb502fc53013edf69f640
 	md5sums = f0e2fa73dd9a7c271e38c179b4e284a3
-	md5sums = b1eb2bcf5a0ff86bf128d13dc41d83de
+	md5sums = 2cd183f3ffcb9d4560dd6f275323baa5
 	sha1sums = 8fdf1dddd2250fa14fe5878a7271f6693427de10
 	sha1sums = 9f12e2f0db63083a3fa4e5b6fdfd10c8dfd038c0
 	sha1sums = 4ced7d28c3c5880db600bf4769fdb1a3dc3a6fce
-	sha1sums = 89c2d3aabacb88343d60f57f4fe47546ab95ccf5
+	sha1sums = 9a4b0d63fed9af9f4619beed02fbe62f08c214f4
 
 pkgname = soapui
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b59d17b687f7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+src/*
+pkg/*
+soapui-*.zst
+SoapUI-*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index d8611ce5123f..36b511e11cad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Do not forget SRCINFO :  makepkg --printsrcinfo > .SRCINFO
 pkgname=soapui
 pkgver=5.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical Java program for inspecting, invoking, monitoring, simulating/mocking and functional/load/compliance/surveillance testing of REST/WADL and SOAP/WSDL-based Web Services over HTTP."
 arch=('i686' 'x86_64')
 url="http://www.soapui.org/"
@@ -18,17 +18,14 @@ source=("https://s3.amazonaws.com/downloads.eviware/soapuios/$pkgver/SoapUI-$pkg
 md5sums=('10be0158efbe3ab77eaf19c664454f03'
          '3cc08aca62edb502fc53013edf69f640'
          'f0e2fa73dd9a7c271e38c179b4e284a3'
-         'b1eb2bcf5a0ff86bf128d13dc41d83de')
+         '2cd183f3ffcb9d4560dd6f275323baa5')
 sha1sums=('8fdf1dddd2250fa14fe5878a7271f6693427de10'
           '9f12e2f0db63083a3fa4e5b6fdfd10c8dfd038c0'
           '4ced7d28c3c5880db600bf4769fdb1a3dc3a6fce'
-          '89c2d3aabacb88343d60f57f4fe47546ab95ccf5')
+          '9a4b0d63fed9af9f4619beed02fbe62f08c214f4')
 
 build() {
   cd "${srcdir}/SoapUI-${pkgver}"
-
-  #Correction du bug jxplorer
-  sed -i -e 's/^java/${JAVA_HOME}\/bin\/java/' bin/soapui.sh
 }
 
 package() {
diff --git a/soapui b/soapui
index 19edd8c2bf97..d9297f9f147e 100755
--- a/soapui
+++ b/soapui
@@ -6,38 +6,21 @@
 ### ====================================================================== ###
 
 ### $Id$ ###
-
-DIRNAME=`dirname $0`
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false;
-darwin=false;
-case "`uname`" in
-    CYGWIN*)
-        cygwin=true
-        ;;
-    Darwin*)
-        darwin=true
-        ;;
-esac
+DIRNAME=$(dirname $0)
 
 # Setup SOAPUI_HOME
 SOAPUI_HOME=/usr/share/soapui
 export SOAPUI_HOME
 
-SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-#SOAPUIVER#.jar:$SOAPUI_HOME/lib/*
+SOAPUI_CLASSPATH="$SOAPUI_HOME/bin/soapui-#SOAPUIVER#.jar:$SOAPUI_HOME/lib/*"
 
 export SOAPUI_CLASSPATH
 
 JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png"
 JAVA_OPTS="$JAVA_OPTS -Dawt.useSystemAAFontSettings=on -Duser.home=$HOME/.soapuios/ -Dsoapui.logroot=$HOME/.soapuios/"
-JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator`
+JFXRTPATH=$(${JAVA_HOME}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator)
 SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH
 
-if $darwin
-then
-    JAVA_OPTS="$JAVA_OPTS -Dswing.crossplatformlaf=apple.laf.AquaLookAndFeel -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
-fi
 
 if [ $SOAPUI_HOME != "" ] 
 then
@@ -52,13 +35,6 @@ fi
 
 export JAVA_OPTS
 
-# For Cygwin, switch paths to Windows format before running java
-if [ $cygwin = "true" ] 
-then
-    SOAPUI_HOME=`cygpath --path --dos "$SOAPUI_HOME"`
-    SOAPUI_CLASSPATH=`cygpath --path --dos "$SOAPUI_CLASSPATH"`
-fi
-
 cd $DIRNAME
 echo ================================
 echo =
@@ -66,4 +42,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME
 echo =
 echo ================================
 
-${JAVA_HOME}/bin/java $JAVA_OPTS -cp $SOAPUI_CLASSPATH com.eviware.soapui.SoapUI "$@"
+"${JAVA_HOME}/bin/java" ${JAVA_OPTS} -cp ${SOAPUI_CLASSPATH} com.eviware.soapui.SoapUI "$@"
diff --git a/soapui.png b/soapui.png
new file mode 100644
index 000000000000..1bfee4609255
--- /dev/null
+++ b/soapui.png