summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/android-studio/android-studio.SlackBuild22
-rw-r--r--development/android-studio/android-studio.desktop2
-rw-r--r--development/android-studio/android-studio.info6
3 files changed, 19 insertions, 11 deletions
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
diff --git a/development/android-studio/android-studio.desktop b/development/android-studio/android-studio.desktop
index 79f20d98e8..ca7048aea8 100644
--- a/development/android-studio/android-studio.desktop
+++ b/development/android-studio/android-studio.desktop
@@ -3,7 +3,7 @@ Name=Android Studio
GenericName=Android IDE
Comment=Android development environment based on IntelliJ IDEA
Exec=/usr/share/android-studio/bin/studio.sh
-Icon=/usr/share/android-studio/bin/studio.ico
+Icon=/usr/share/android-studio/bin/studio.png
Path=/usr/share/android-studio/bin/
Type=Application
Categories=Development;Android
diff --git a/development/android-studio/android-studio.info b/development/android-studio/android-studio.info
index 79f9e72a5c..f67efa085b 100644
--- a/development/android-studio/android-studio.info
+++ b/development/android-studio/android-studio.info
@@ -1,8 +1,8 @@
PRGNAM="android-studio"
-VERSION="2.1.2.0_143_2915827"
+VERSION="2.2.2.0_145_3360264"
HOMEPAGE="http://developer.android.com/tools/studio/index.html"
-DOWNLOAD="https://dl.google.com/dl/android/studio/ide-zips/2.1.2.0/android-studio-ide-143.2915827-linux.zip"
-MD5SUM="efb02121791b10216e41ee17c311761d"
+DOWNLOAD="https://dl.google.com/dl/android/studio/ide-zips/2.2.2.0/android-studio-ide-145.3360264-linux.zip"
+MD5SUM="2ee9429d73815c3420ed4256143eec09"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jdk"