From a1dab4e2b5267c7851b69b8046b36b80efae63ae Mon Sep 17 00:00:00 2001
From: Roberto Metere <roberto@metere.it>
Date: Thu, 1 Dec 2016 16:40:09 +0700
Subject: development/android-studio: Updated for version 2.2.2.0_145_3360264.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 .../android-studio/android-studio.SlackBuild       | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'development/android-studio/android-studio.SlackBuild')

diff --git a/development/android-studio/android-studio.SlackBuild b/development/android-studio/android-studio.SlackBuild
index b6d5bd4563..32631c9f2d 100644
--- a/development/android-studio/android-studio.SlackBuild
+++ b/development/android-studio/android-studio.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=android-studio
-VERSION=${VERSION:-2.1.2.0_143_2915827}
+VERSION=${VERSION:-2.2.2.0_145_3360264}
 SRCVER=$(echo ${VERSION#*_} | sed 's/_/./')
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -46,6 +46,7 @@ mkdir -p $TMP $PKG $OUTPUT
 mkdir -p $PKG/usr/share
 cd $PKG/usr/share/
 unzip $CWD/$PRGNAM-ide-${SRCVER}-linux.zip
+cd $PKG
 
 #
 # Make and install launchers
@@ -53,16 +54,23 @@ unzip $CWD/$PRGNAM-ide-${SRCVER}-linux.zip
 mkdir -p $PKG/usr/share/applications
 install -D -m 644 $CWD/android-studio.desktop $PKG/usr/share/applications/android-studio.desktop
 mkdir -p $PKG/usr/bin
-for i in $(find $PWD -executable -type f | grep -v -e "\.sh$")
-do
-  ln -s /usr/share/$PRGNAM/bin/$(basename $i) ../bin/.
-done
-ln -s /usr/share/$PRGNAM/bin/studio.sh ../bin/$PRGNAM
-ln -s /usr/share/$PRGNAM/bin/inspect.sh ../bin/$PRGNAM-inspect
+(
+	cd $PKG/usr/bin
+	for i in $(find $PKG/usr/share/ -executable -type f | grep -v -e "\.sh$")
+	do
+		if [ ! -e "$PKG/usr/bin/$(basename $i)" -a ! -h "$PKG/usr/bin/$(basename $i)" ]
+		then
+			ln -s ../share/$PRGNAM/bin/$(basename $i) .
+		fi
+	done
+	ln -s ../share/$PRGNAM/bin/studio.sh $PRGNAM
+	ln -s ../share/$PRGNAM/bin/inspect.sh $PRGNAM-inspect
+)
 
 # Adjust ownerships and permissions
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
+chmod +x usr/share/$PRGNAM/bin/studio.sh usr/share/$PRGNAM/bin/inspect.sh
 
 cd
 
-- 
cgit v1.2.3