1 files changed, 18 insertions, 14 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 3e3551f8d0543..26e846f5e9c60 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+#
 # Slackware build script for android-tools
 # Thanks to the Arch linux maintainers for the makefiles
 
@@ -26,7 +26,6 @@
 
 PRGNAM=android-tools
 VERSION=${VERSION:-5.0.2_r1}
-
 SRCVERSION1=8032f3b5a501dabc1e28925cca834d2a39efbdee
 SRCVERSION2=ba2a23604727e5b333dd16a9287556d799d6d39e
 SRCVERSION3=3946f9119bf4eadfcfb17bd15661515328cbbc86
@@ -64,16 +63,21 @@ fi
 
 set -e
 
-rm -rf $TMP/$PRGNAM $PKG
-mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
-
-cd $TMP/$PRGNAM
-
-mkdir core extras libselinux f2fs-tools
-tar xvf $CWD/$SRCVERSION1.tar.gz -C core
-tar xvf $CWD/$SRCVERSION2.tar.gz -C extras
-tar xvf $CWD/$SRCVERSION3.tar.gz -C libselinux
-tar xvf $CWD/$SRCVERSION4.tar.gz -C f2fs-tools
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $TMP/android-tools
+mkdir $TMP/android-tools
+cd $TMP/android-tools
+
+mkdir core
+tar -xvf $CWD/$SRCVERSION1.tar.gz -C core
+mkdir extras
+tar -xvf $CWD/$SRCVERSION2.tar.gz -C extras
+mkdir libselinux
+tar -xvf $CWD/$SRCVERSION3.tar.gz -C libselinux
+mkdir f2fs-tools
+tar -xvf $CWD/$SRCVERSION4.tar.gz -C f2fs-tools
 
 #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/core
 #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/extras
@@ -95,8 +99,8 @@ make -C core/adb -f $TMP/android-tools/adbMakefile
 make -C core/fastboot -f $TMP/android-tools/fastbootMakefile
 
 mkdir -p $PKG/usr/bin
-install -Dm 0755 core/adb/adb $PKG/usr/bin/adb
-install -Dm 0755 core/fastboot/fastboot $PKG/usr/bin/fastboot
+install -Dm 755 core/adb/adb $PKG/usr/bin/adb
+install -Dm 755 core/fastboot/fastboot $PKG/usr/bin/fastboot
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true