From 33e2a439df60453f2694dfeb1557b5bb8d0cf163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin.decimo@gmail.com>
Date: Sun, 21 Sep 2014 12:51:09 +0200
Subject: [PATCH] Fix bugs with icon directory argument

---
 scripts/android.sh | 20 ++++++++++----------
 scripts/debian.sh  |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/android.sh b/scripts/android.sh
index c81855f..70bbf31 100644
--- a/scripts/android.sh
+++ b/scripts/android.sh
@@ -131,40 +131,40 @@ if [ -n "$ICON_DIR" ]; then
         RES=$(echo "$ICON" | grep -Eo "[0-9]+x[0-9]+")
         EXT=$(echo "$ICON" | sed -e 's/.*\.//g')
         if [ "$RES" = "42x42" ]; then
-            cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" \
+            cp "$ICON_DIR"/"$ICON" \
                 "$LOVE_ANDROID_DIR"/res/drawable-mdpi/ic_launcher.png
         elif [ "$RES" = "72x72" ]; then
-            cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" \
+            cp "$ICON_DIR"/"$ICON" \
                 "$LOVE_ANDROID_DIR"/res/drawable-hdpi/ic_launcher.png
         elif [ "$RES" = "96x96" ]; then
-            cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" \
+            cp "$ICON_DIR"/"$ICON" \
                 "$LOVE_ANDROID_DIR"/res/drawable-xhdpi/ic_launcher.png
         elif [ "$RES" = "144x144" ]; then
-            cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" \
+            cp "$ICON_DIR"/"$ICON" \
                 "$LOVE_ANDROID_DIR"/res/drawable-xxhdpi/ic_launcher.png
         elif [ "$RES" = "732x412" ]; then
-            cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" \
+            cp "$ICON_DIR"/"$ICON" \
                 "$LOVE_ANDROID_DIR"/res/drawable-xhdpi/ouya_icon.png
         fi
     done
     if [ -f "$PROJECT_DIR/$ICON_DIR/drawable-mdpi/ic_launcher.png" ]; then
-        cp "$PROJECT_DIR"/"$ICON_DIR"/drawable-mdpi/ic_launcher.png \
+        cp "$ICON_DIR"/drawable-mdpi/ic_launcher.png \
             "$LOVE_ANDROID_DIR"/res/drawable-mdpi/ic_launcher.png
     fi
     if [ -f "$PROJECT_DIR/$ICON_DIR/drawable-hdpi/ic_launcher.png" ]; then
-        cp "$PROJECT_DIR"/"$ICON_DIR"/drawable-hdpi/ic_launcher.png \
+        cp "$ICON_DIR"/drawable-hdpi/ic_launcher.png \
             "$LOVE_ANDROID_DIR"/res/drawable-hdpi/ic_launcher.png
     fi
     if [ -f "$PROJECT_DIR/$ICON_DIR/drawable-xhdpi/ic_launcher.png" ]; then
-        cp "$PROJECT_DIR"/"$ICON_DIR"/drawable-xhdpi/ic_launcher.png \
+        cp "$ICON_DIR"/drawable-xhdpi/ic_launcher.png \
             "$LOVE_ANDROID_DIR"/res/drawable-xhdpi/ic_launcher.png
     fi
     if [ -f "$PROJECT_DIR/$ICON_DIR/drawable-xxhdpi/ic_launcher.png" ]; then
-        cp "$PROJECT_DIR"/"$ICON_DIR"/drawable-xxhdpi/ic_launcher.png \
+        cp "$ICON_DIR"/drawable-xxhdpi/ic_launcher.png \
             "$LOVE_ANDROID_DIR"/res/drawable-xxhdpi/ic_launcher.png
     fi
     if [ -f "$PROJECT_DIR/$ICON_DIR/drawable-xhdpi/ouya_icon.png" ]; then
-        cp "$PROJECT_DIR"/"$ICON_DIR"/drawable-xhdpi/ouya_icon.png \
+        cp "$ICON_DIR"/drawable-xhdpi/ouya_icon.png \
             "$LOVE_ANDROID_DIR"/res/drawable-xhdpi/ouya_icon.png
     fi
 fi
diff --git a/scripts/debian.sh b/scripts/debian.sh
index 7523884..af67b41 100644
--- a/scripts/debian.sh
+++ b/scripts/debian.sh
@@ -132,12 +132,12 @@ if [ -n "$ICON_DIR" ]; then
         EXT=$(echo "$ICON" | sed -e 's/.*\.//g')
         if [ "$EXT" = "svg" ]; then
             mkdir -p $ICON_LOC/scalable/apps
-            cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" $ICON_LOC/scalable/apps/${PACKAGE_NAME}.$EXT
+            cp "$ICON_DIR"/"$ICON" $ICON_LOC/scalable/apps/${PACKAGE_NAME}.$EXT
             chmod 0644 $ICON_LOC/scalable/apps/${PACKAGE_NAME}.$EXT
         else
             if [ -n "$RES" ]; then
                 mkdir -p $ICON_LOC/$RES/apps
-                cp "$PROJECT_DIR"/"$ICON_DIR"/"$ICON" $ICON_LOC/$RES/apps/${PACKAGE_NAME}.$EXT
+                cp "$ICON_DIR"/"$ICON" $ICON_LOC/$RES/apps/${PACKAGE_NAME}.$EXT
                 chmod 0644 $ICON_LOC/$RES/apps/${PACKAGE_NAME}.$EXT
             fi
         fi