1 files changed, 16 insertions, 11 deletions
diff --git a/development/gisto/gisto.SlackBuild b/development/gisto/gisto.SlackBuild
index 21c4331782..0d3def4ed5 100644
--- a/development/gisto/gisto.SlackBuild
+++ b/development/gisto/gisto.SlackBuild
@@ -22,7 +22,7 @@
 
 PRGNAM=gisto
 SRCNAM=Gisto
-VERSION=${VERSION:-0.3.1}
+VERSION=${VERSION:-20160110}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,26 +42,31 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-  SRCARCH=x86
-  SRCARCHSHORT=ia32
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  SRCARCH=x86
-  SRCARCHSHORT=ia32
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SRCARCH=x86_64
-  SRCARCHSHORT=x64
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+fi
+
+SHORTSYSARCH=${SHORTSYSARCH:-`getconf LONG_BIT`}
+
+if [ "${SHORTSYSARCH}" = "32" ]; then
   SRCARCH=x86
   SRCARCHSHORT=ia32
+elif [ "${SHORTSYSARCH}" = "64" ]; then
+  SRCARCH=x86_64
+  SRCARCHSHORT=x64
+else
+  echo "Your architecture is not supported."
+  exit 1
 fi
 
-DOCS="README setup"
+DOCS=""
 
 set -e
 
@@ -69,7 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION-linux\_$SRCARCHSHORT/
-tar xvpf $CWD/$SRCNAM-$VERSION-Linux\_$SRCARCH.tar.gz
+unzip $CWD/$PRGNAM-$VERSION-linux-$SRCARCHSHORT.zip -d $SRCNAM-$VERSION-linux\_$SRCARCHSHORT/
 cd $SRCNAM-$VERSION-linux\_$SRCARCHSHORT/
 chown -R root:root .
 find -L . \
@@ -79,7 +84,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM/
-cp -ar setup share gisto/* $PKG/opt/$PRGNAM/
+cp -ar * $PKG/opt/$PRGNAM/
 
 mkdir -p $PKG/usr/bin/
 ln -sf /opt/$PRGNAM/${PRGNAM} $PKG/usr/bin/
@@ -94,7 +99,7 @@ ln -sf /opt/$PRGNAM/pixmaps/${PRGNAM}.xpm $PKG/usr/share/pixmaps/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
+#cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc