Fix install script

3 files changed, 17 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db4cd32f691d..6193aacb8e8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = saltedauth
 	pkgdesc = SaltedAuth -- More secure credential manager for Connective http servers.
 	pkgver = 1.0.0
-	pkgrel = 5
+	pkgrel = 6
 	install = main.install
 	arch = any
 	groups = connective-server
diff --git a/PKGBUILD b/PKGBUILD
index e6387690bdd3..07f34421aa76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=saltedauth
 pkgver=1.0.0
 
-pkgrel=5
+pkgrel=6
 pkgdesc="SaltedAuth -- More secure credential manager for Connective http servers."
 arch=( 'any' )
 url=""
diff --git a/main.install b/main.install
index 90c888b1746c..c4785fed5151 100644
--- a/main.install
+++ b/main.install
@@ -15,7 +15,7 @@ post_install() {
     
     mkdir "$serverDir/modules" -p
     chown connective:connective "$serverDir/modules" -R
-    cp "/usr/lib/salted/SaltedAuth.jar" "$serverDir/modules/SaltedAuth.jar" -f
+    ln -sf "/usr/lib/salted/SaltedAuth.jar" "$serverDir/modules/SaltedAuth.jar"
     chown connective "$serverDir/modules/SaltedAuth.jar"
        
     if [ -f "$serverDir"/server.ccfg ]; then
@@ -23,6 +23,20 @@ post_install() {
     fi
 }
 
+post_upgrade() {
+    serverDir=/etc/connective-http
+    classPathFolders=( "libs/" )
+    mainType=org.asf.connective.standalone.main.ConnectiveStandalone
+    credtoolLibs=()
+    credtoolTarget=""
+    jvmArguments="-Djava.net.preferIPv4Stack=true"
+
+    if [ -f "/etc/connective-http/config.props" ]; then
+        source "/etc/connective-http/config.props"
+    fi
+    ln -sf "/usr/lib/salted/SaltedAuth.jar" "$serverDir/modules/SaltedAuth.jar"
+}
+
 post_remove() {
     serverDir=/etc/connective-http
     classPathFolders=( "libs/" )