Merge branch 'revolter-hotfix/icon-versioning'

Pod/Assets/Scripts/iconVersioning.sh

@@ -1,4 +1,9 @@
 #!/bin/sh
+
+if [ $CONFIGURATION = "Release" ]; then
+  exit 0
+fi
+
 export PATH=/opt/local/bin/:/opt/local/sbin:$PATH:/usr/local/bin:
 
 convertPath=`which convert`
@@ -43,87 +48,100 @@ shopt -u extglob
 caption="${version} ($build_num)\n${branch}\n${commit}"
 echo $caption
 
-function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; }
+function abspath() {
+	pushd . > /dev/null
+
+	if [ -d "$1" ]; then
+		cd "$1"
+		dirs -l +0
+	else
+		cd "`dirname \"$1\"`"
+		cur_dir=`dirs -l +0`
+
+		if [ "$cur_dir" == "/" ]; then
+			echo "$cur_dir`basename \"$1\"`"
+		else
+			echo "$cur_dir/`basename \"$1\"`"
+		fi
+	fi
+
+	popd > /dev/null
+}
 
 function processIcon() {
     base_file=$1
-    
+
     cd "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-    base_path=`find . -name ${base_file}`
-    
+    base_path=`find . -name ${base_file} -print -quit`
+
     real_path=$( abspath "${base_path}" )
     echo "base path ${real_path}"
-    
+
     if [[ ! -f ${base_path} || -z ${base_path} ]]; then
       return;
     fi
-    
+
     # TODO: if they are the same we need to fix it by introducing temp
     target_file=`basename $base_path`
     target_path="${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/${target_file}"
-    
+
     base_tmp_normalizedFileName="${base_file%.*}-normalized.${base_file##*.}"
     base_tmp_path=`dirname $base_path`
     base_tmp_normalizedFilePath="${base_tmp_path}/${base_tmp_normalizedFileName}"
-    
+
     stored_original_file="${base_tmp_normalizedFilePath}-tmp"
     if [[ -f ${stored_original_file} ]]; then
       echo "found previous file at path ${stored_original_file}, using it as base"
       mv "${stored_original_file}" "${base_path}"
     fi
-
-    if [ $CONFIGURATION = "Release" ]; then
-      cp "${base_path}" "$target_path"
-      return 0;
-    fi
-
+
     echo "Reverting optimized PNG to normal"
     # Normalize
     echo "xcrun -sdk iphoneos pngcrush -revert-iphone-optimizations -q ${base_path} ${base_tmp_normalizedFilePath}"
     xcrun -sdk iphoneos pngcrush -revert-iphone-optimizations -q "${base_path}" "${base_tmp_normalizedFilePath}"
-    
+
     # move original pngcrush png to tmp file
     echo "moving pngcrushed png file at ${base_path} to ${stored_original_file}"
     #rm "$base_path"
     mv "$base_path" "${stored_original_file}"
-    
+
     # Rename normalized png's filename to original one
     echo "Moving normalized png file to original one ${base_tmp_normalizedFilePath} to ${base_path}"
     mv "${base_tmp_normalizedFilePath}" "${base_path}"
-    
+
     width=`identify -format %w ${base_path}`
     height=`identify -format %h ${base_path}`
     band_height=$((($height * 47) / 100))
     band_position=$(($height - $band_height))
     text_position=$(($band_position - 3))
     point_size=$(((13 * $width) / 100))
-    
+
     echo "Image dimensions ($width x $height) - band height $band_height @ $band_position - point size $point_size"
-    
+
     #
     # blur band and text
     #
     convert ${base_path} -blur 10x8 /tmp/blurred.png
     convert /tmp/blurred.png -gamma 0 -fill white -draw "rectangle 0,$band_position,$width,$height" /tmp/mask.png
     convert -size ${width}x${band_height} xc:none -fill 'rgba(0,0,0,0.2)' -draw "rectangle 0,0,$width,$band_height" /tmp/labels-base.png
     convert -background none -size ${width}x${band_height} -pointsize $point_size -fill white -gravity center -gravity South caption:"$caption" /tmp/labels.png
-    
+
     convert ${base_path} /tmp/blurred.png /tmp/mask.png -composite /tmp/temp.png
-    
+
     rm /tmp/blurred.png
     rm /tmp/mask.png
-    
+
     #
     # compose final image
     #
     filename=New${base_file}
     convert /tmp/temp.png /tmp/labels-base.png -geometry +0+$band_position -composite /tmp/labels.png -geometry +0+$text_position -geometry +${w}-${h} -composite "${target_path}"
-    
+
     # clean up
     rm /tmp/temp.png
     rm /tmp/labels-base.png
     rm /tmp/labels.png
-    
+
     echo "Overlayed ${target_path}"
 }