Repair installation process

- Move back from /opt to /usr (/usr/share) and using upstream
  installation scripts
- Their install scripts do pollute the system with files not
  tracked by the package manager that might not get properly
  deleted/cleaned, though it's too convoluted to safely recreate
  within pkgbuild

7 files changed, 59 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e705ee7c993..e7caa79d846b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = nomachine-enterprise-client
-	pkgdesc = Remote desktop application
+	pkgdesc = Remote desktop application, client only
 	pkgver = 7.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nomachine.com
-	install = nm-ent-client.install
+	install = nomachine-client.install
 	arch = x86_64
 	arch = i686
 	groups = network
@@ -11,7 +11,6 @@ pkgbase = nomachine-enterprise-client
 	conflicts = nomachine
 	conflicts = nxmanager
 	conflicts = nxwebplayer
-	conflicts = nxserver
 	conflicts = nxnode
 	conflicts = nxclient
 	options = !strip
@@ -29,4 +28,3 @@ pkgbase = nomachine-enterprise-client
 	sha256sums_i686 = db9be126898bf9d2052db12596abf236d05d41698cc9249ae68a645b2d474a88
 
 pkgname = nomachine-enterprise-client
-
diff --git a/PKGBUILD b/PKGBUILD
index 2faf1e34e5a2..88fa30a333a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,15 @@ pkgname=nomachine-enterprise-client
 pkgver=7.6.2
 _x64_rel=4
 _i686_rel=1
-pkgrel=1
-pkgdesc="Remote desktop application"
+pkgrel=2
+pkgdesc="Remote desktop application, client only"
 groups=('network')
 url="http://www.nomachine.com"
 license=('custom:"NoMachine EULA"')
 arch=('x86_64' 'i686')
 options=('!strip')
-conflicts=(nomachine nxmanager nxwebplayer nxserver nxnode nxclient)
-install=nm-ent-client.install
+conflicts=(nomachine nxmanager nxwebplayer nxnode nxclient)
+install=nomachine-client.install
 backup=(etc/NX/player/localhost/{player,client}.cfg)
 
 source=(player.cfg client.cfg nomachine-client)
@@ -27,13 +27,16 @@ sha256sums_i686=('db9be126898bf9d2052db12596abf236d05d41698cc9249ae68a645b2d474a
 
 package()
 {
-  install -Dm644 player.cfg client.cfg -t "${pkgdir}/etc/NX/player/localhost"
+    mkdir -p "${pkgdir}/etc/NX/player/localhost"
+    install -Dm644 player.cfg client.cfg -t "${pkgdir}/etc/NX/player/localhost"
 
-  install -Dm755 nomachine-client -t "${pkgdir}/usr/bin"
+    install -dm777 "${pkgdir}/media/nomachine"
 
-  mkdir -p "${pkgdir}/opt"
-  cd "${pkgdir}/opt"
-  tar -xzf "${srcdir}/NX/etc/NX/player/packages/nxclient.tar.gz"
-  tar -xzf "${srcdir}/NX/etc/NX/player/packages/nxplayer.tar.gz"
+    install -Dm755 nomachine-client -t "${pkgdir}/usr/bin"
 
+    mkdir -p "${pkgdir}/usr/share"
+
+    cd "${pkgdir}/usr/share"
+    tar -xzf "${srcdir}/NX/etc/NX/player/packages/nxclient.tar.gz"
+    tar -xzf "${srcdir}/NX/etc/NX/player/packages/nxplayer.tar.gz"
 }
diff --git a/client.cfg b/client.cfg
index 9d6b3b124431..d7e93aec9283 100644
--- a/client.cfg
+++ b/client.cfg
@@ -11,4 +11,4 @@
 # installed.
 #
 
-ClientRoot = "/opt/NX"
+ClientRoot = "/usr/share/NX"
diff --git a/nm-ent-client.install b/nm-ent-client.install
deleted file mode 100644
index 602e8d01ac6b..000000000000
--- a/nm-ent-client.install
+++ /dev/null
@@ -1,25 +0,0 @@
-_check_remove_old_prefix()
-{
-    if [ -d /usr/NX ]; then
-        echo "Old installation (/usr) found, removing"
-
-        if [ -x /usr/NX/scripts/setup/nxclient ]; then
-            NX_INSTALL_PREFIX=/usr /usr/NX/scripts/setup/nxclient --uninstall fedora
-        fi
-
-        rm -rf /usr/NX
-    fi
-}
-
-pre_remove()
-{
-    echo "Running NX pre_remove script..."
-    NX_INSTALL_PREFIX=/opt /opt/NX/scripts/setup/nxclient --uninstall arch
-    rm -rf /opt/NX
-}
-
-
-pre_upgrade()
-{
-    _check_remove_old_prefix
-}
diff --git a/nomachine-client b/nomachine-client
index 6650b1349f8f..037a42fd755a 100755
--- a/nomachine-client
+++ b/nomachine-client
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-/opt/NX/bin/nxclient --monitor
+/usr/share/NX/bin/nxplayer
diff --git a/nomachine-client.install b/nomachine-client.install
new file mode 100644
index 000000000000..d397d7c91c7b
--- /dev/null
+++ b/nomachine-client.install
@@ -0,0 +1,40 @@
+_invoke() {
+    # arg1: --install | --update | --uninstall
+    # NX_INSTALL_DEBUG=1
+    NX_INSTALL_PREFIX=/usr/share /usr/share/NX/scripts/setup/nxclient "$1" arch
+}
+
+
+_check_remove_old_prefix()
+{
+    if [ -d /usr/NX ]; then
+        echo "Old installation (/usr) found, removing"
+
+        if [ -x /usr/NX/scripts/setup/nxclient ]; then
+            NX_INSTALL_PREFIX=/usr /usr/NX/scripts/setup/nxclient --uninstall fedora
+        fi
+
+        rm -rf /usr/NX
+    fi
+}
+
+post_install()
+{   
+    echo "Running NX post_install script ..."
+    _invoke --install
+}
+
+pre_remove()
+{
+    echo "Running NX pre_remove script ..."
+    _invoke --uninstall
+}
+
+
+post_upgrade()
+{
+    echo "Running NX post_upgrade script ..."
+    _check_remove_old_prefix
+    chmod +x /usr/share/NX/scripts/restricted/nxusb.sh || true
+    _invoke --update
+}
diff --git a/player.cfg b/player.cfg
index 74dc3c62d2f6..32df080f00f8 100644
--- a/player.cfg
+++ b/player.cfg
@@ -11,4 +11,4 @@
 # installed.
 #
 
-PlayerRoot = "/opt/NX"
+PlayerRoot = "/usr/share/NX"