Fixed Gecode Gist

5 files changed, 26 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c6cb950c7ad..ae896447d866 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = minizinc-ide
 	pkgdesc = Simple IDE for writing and running MiniZinc models
 	pkgver = 2.4.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.minizinc.org/ide/
 	install = minizinc-ide.install
 	arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = minizinc-ide
 	source = fzn-gecode-gist-lib-path.patch
 	source = https://raw.githubusercontent.com/MiniZinc/MiniZincIDE/master/resources/icon.png
 	source = https://github.com/MiniZinc/MiniZincIDE/releases/download/2.4.3/MiniZincIDE-2.4.3-bundle-linux-x86_64.tgz
-	sha256sums = bf26b9e3cae148fb05ce131ef62076bda467ebd2ce9913525a5540f09435c2b6
-	sha256sums = 657090bd7d93d16648e12c8df14f65e858ee49c2384b137ff7e1abb61b291a6a
+	sha256sums = e0bca68c0897cbcd63bf603ad1f352c16c5fc62ee8f151daa7e793361007d242
+	sha256sums = 80ab03ebe936ce85b107523ae242d97905763ed30596639e1778cdea796b9e1e
 	sha256sums = eaa69a6d1b8a3e307d1b400b74273995abb914fbe1246c65fc9b3955b2094023
 	sha256sums = b169c93f8a665d85615f008d850ecd2a4097ccfe20322c54f2548bde7646555d
 
diff --git a/PKGBUILD b/PKGBUILD
index 057b2ca1ed13..22d0f3a120d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Fabio Tardivo <x95a31x at gmail dot com>
 pkgname=minizinc-ide
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple IDE for writing and running MiniZinc models"
 arch=(x86_64)
 url=http://www.minizinc.org/ide/
@@ -18,13 +18,12 @@ source=(
     https://github.com/MiniZinc/MiniZincIDE/releases/download/$pkgver/MiniZincIDE-$pkgver-bundle-linux-$arch.tgz
 )
 sha256sums=(
-    bf26b9e3cae148fb05ce131ef62076bda467ebd2ce9913525a5540f09435c2b6
-    657090bd7d93d16648e12c8df14f65e858ee49c2384b137ff7e1abb61b291a6a
+    e0bca68c0897cbcd63bf603ad1f352c16c5fc62ee8f151daa7e793361007d242
+    80ab03ebe936ce85b107523ae242d97905763ed30596639e1778cdea796b9e1e
     eaa69a6d1b8a3e307d1b400b74273995abb914fbe1246c65fc9b3955b2094023
     b169c93f8a665d85615f008d850ecd2a4097ccfe20322c54f2548bde7646555d
 )
 
-
 prepare() {
     # Workaround for https://github.com/MiniZinc/MiniZincIDE/issues/90
     cd $srcdir/MiniZincIDE-$pkgver-bundle-linux-$arch
diff --git a/fzn-gecode-gist-lib-path.patch b/fzn-gecode-gist-lib-path.patch
index a8d8f12986d0..bf7f63608e1a 100644
--- a/fzn-gecode-gist-lib-path.patch
+++ b/fzn-gecode-gist-lib-path.patch
@@ -1,7 +1,9 @@
---- bin/fzn-gecode-gist
-+++ bin/fzn-gecode-gist
+--- bin/run-fzn-gecode-gist
++++ bin/run-fzn-gecode-gist
 @@ -1,3 +1,4 @@
  #!/bin/bash
- DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-+export LD_LIBRARY_PATH="$DIR"/../lib:$LD_LIBRARY_PATH
- exec "$DIR"/fzn-gecode -mode gist "$@"
+-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
++DIR=$( cd "$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )" && pwd )
++export LD_LIBRARY_PATH="$DIR/../lib":$LD_LIBRARY_PATH
+ exec "$DIR"/fzn-gecode-gist -mode gist "$@"
+ 
diff --git a/minizinc-ide.desktop b/minizinc-ide.desktop
index 07afae7b626a..7c2d83c6252e 100644
--- a/minizinc-ide.desktop
+++ b/minizinc-ide.desktop
@@ -3,6 +3,6 @@ Type=Application
 Name=MiniZinc IDE
 Comment=Simple IDE for writing and running MiniZinc models
 Icon=/opt/minizinc-ide/resources/icon.png
-Exec=/opt/minizinc-ide/MiniZincIDE.sh
+Exec=MiniZincIDE
 Terminal=false
 Categories=Development;IDE;
diff --git a/minizinc-ide.install b/minizinc-ide.install
index 3ab979aa0d79..79ec6e46ee5c 100644
--- a/minizinc-ide.install
+++ b/minizinc-ide.install
@@ -1,21 +1,24 @@
-pkgname=minizinc-ide
+bins="findMUS fzn-chuffed fzn-gecode minizinc minizinc-globalizer  MiniZincIDE"
+binsPath="/opt/minizinc-ide/bin"
 
 post_install() {
-    # Create links to MiniZinc executables
-    for e in $(find /opt/$pkgname/bin -type f -executable -printf "%P\n")
+    # Create links to bins
+    for b in $bins
     do
-        ln -s /opt/$pkgname/bin/$e /usr/bin/$e
+        ln -s $binsPath/$b /usr/bin/$b
     done
     
-    ln -s /opt/$pkgname/MiniZincIDE.sh /usr/bin/minizinc-ide
+    # Create links to scripts
+    ln -s $binsPath/run-fzn-gecode-gist /usr/bin/fzn-gecode-gist
 }
 
 pre_remove() {
-    # Remove links to MiniZinc executables
-    for e in $(find /opt/$pkgname/bin -type f -executable -printf "%P\n")
+    # Remove links to bins
+    for b in $bins
     do
-        rm /usr/bin/$e
+        rm /usr/bin/$b
     done
     
-    rm /usr/bin/minizinc-ide
+    # Remove links to scripts
+    rm /usr/bin/fzn-gecode-gist
 }