# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1416495723 -3600
# Node ID dd4436ade9f95a2ea937f9f6341c8ed1d2c6b05e
# Parent  34ec09ef65cae60699d677641b48a9a0a8e54bc1
apk-studio, jad, jd-gui, rpix86: fix path

diff -r 34ec09ef65ca -r dd4436ade9f9 apk-studio
--- a/apk-studio	Wed Nov 19 13:55:21 2014 +0100
+++ b/apk-studio	Thu Nov 20 16:02:03 2014 +0100
@@ -10,9 +10,9 @@
 wget --no-check-certificate -O $TARBALL "$WGET_URL"
 [ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
 
-mkdir -p $PACKAGE-$VERSION/usr/share/$PACKAGE $PACKAGE-$VERSION/usr/bin
-tar xjf $TARBALL -C $PACKAGE-$VERSION/usr/share/$PACKAGE
-cat > $PACKAGE-$SOURCE/usr/bin/apkstudio <<EOT
+mkdir -p $PACKAGE-$VERSION/fs/usr/share/$PACKAGE $PACKAGE-$VERSION/fs/usr/bin
+tar xjf $TARBALL -C $PACKAGE-$VERSION/fs/usr/share/$PACKAGE
+cat > $PACKAGE-$SOURCE/fs/usr/bin/apkstudio <<EOT
 #!/bin/sh
 
 APKSTUDIO_DIRECTORY=/usr/share/$PACKAGE
@@ -21,6 +21,6 @@
 export QT_QPA_PLATFORM_PLUGIN_PATH=\$APKSTUDIO_DIRECTORY/platforms
 \$APKSTUDIO_DIRECTORY/\$APKSTUDIO_BINARY "\$@" -style gtk+
 EOT
-chmod +x $PACKAGE-$SOURCE/usr/bin/apkstudio
+chmod +x $PACKAGE-$SOURCE/fs/usr/bin/apkstudio
 
 set +e
diff -r 34ec09ef65ca -r dd4436ade9f9 jad
--- a/jad	Wed Nov 19 13:55:21 2014 +0100
+++ b/jad	Thu Nov 20 16:02:03 2014 +0100
@@ -10,7 +10,8 @@
 wget -c --no-check-certificate -O $TARBALL $WGET_URL
 [ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
 
-mkdir -p $PACKAGE-$SOURCE/usr/bin
-mv $TARBALL $PACKAGE-$SOURCE/usr/bin
+chmod +x $TARBALL
+mkdir -p $PACKAGE-$VERSION/fs/usr/bin
+mv $TARBALL $PACKAGE-$VERSION/fs/usr/bin
 
 set +e
diff -r 34ec09ef65ca -r dd4436ade9f9 jd-gui
--- a/jd-gui	Wed Nov 19 13:55:21 2014 +0100
+++ b/jd-gui	Thu Nov 20 16:02:03 2014 +0100
@@ -8,7 +8,7 @@
 [ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
 
 tar xzf $TARBALL
-mkdir -p $PACKAGE-$SOURCE/usr/bin
-mv $PACKAGE $PACKAGE-$SOURCE/usr/bin
+mkdir -p $PACKAGE-$VERSION/fs/usr/bin
+mv $PACKAGE $PACKAGE-$VERSION/fs/usr/bin
 
 set +e
diff -r 34ec09ef65ca -r dd4436ade9f9 rpix86
--- a/rpix86	Wed Nov 19 13:55:21 2014 +0100
+++ b/rpix86	Thu Nov 20 16:02:03 2014 +0100
@@ -10,7 +10,8 @@
 tar xzf $TARBALL
 VERSION=$(strings rpix86 | sed '/aspberry/!d;s/.*v *//;s/ .*//')
 
-mkdir -p $PACKAGE-$SOURCE/usr/bin
-mv rpix86 $PACKAGE-$SOURCE/usr/bin
+chmod +x rpix86
+mkdir -p $PACKAGE-$VERSION/fs/usr/bin
+mv rpix86 $PACKAGE-$VERSION/fs/usr/bin
 
 set +e