Update make-all

Signed-off-by: Kouya Heika <kouyaheika@canithesis.org>

make-all.sh

@@ -6,7 +6,7 @@ smilies=(
 	'smiley/coinface'
 	'smiley/aim'
 	'smiley/crtface'
-	'smiley/eusasmilies'
+	'smiley/eusa'
 	'smiley/jcdragons'
 	'smiley/msn'
 	'smiley/onion'
@@ -21,6 +21,7 @@ smilies=(
 	'smiley/xat'
 	'smiley/kolobok'
 	'smiley/yolks'
+	'smiley/yahoo'
 )
 frames=(
 	'frame/win3x.png 24 4 4 5'

make-card.sh

@@ -3,8 +3,9 @@ TARGET_DIRECTORY=${TARGET_DIRECTORY?-out}
 INPUT=$1
 _BASEDIR=`basename $INPUT`
 PACK=${_BASEDIR%.*}
+mkdir -p "$TARGET_DIRECTORY/assets"
 OUTNAME="$(sha256sum "$1" | awk '{ print $1 }').${1##*.}"
-cp "$INPUT" "$TARGET_DIRECTORY/$OUTNAME"
+cp "$INPUT" "$TARGET_DIRECTORY/assets/$OUTNAME"
 echo "Writing card '$PACK'..."
 if [[ $2 == '-' && -z $3 ]]; then
 	sed -e 's/$IMAGE_FILE/'$OUTNAME'/g' "${INPUT%.*}.json" > "$TARGET_DIRECTORY/$PACK.json"

make-frame.sh

@@ -3,9 +3,10 @@ TARGET_DIRECTORY=${TARGET_DIRECTORY?-out}
 INPUT=$1
 _BASEDIR=`basename $INPUT`
 PACK=${_BASEDIR%.*}
+mkdir -p "$TARGET_DIRECTORY/assets"
 printf "{\"$PACK\":{" > "$TARGET_DIRECTORY/$PACK.json"
 OUTNAME="$(sha256sum "$1" | awk '{ print $1 }').${1##*.}"
-cp "$1" "$TARGET_DIRECTORY/$OUTNAME"
+cp "$1" "$TARGET_DIRECTORY/assets/$OUTNAME"
 echo "Writing frame '$PACK'..."
 printf "\"frame\":\"$OUTNAME\"," >> "$TARGET_DIRECTORY/$PACK.json"
 if [ ! -z $5 ]; then

make-smiley.sh

@@ -3,13 +3,14 @@ TARGET_DIRECTORY=${TARGET_DIRECTORY?-out}
 INPUT=$1
 PACK=`basename $INPUT`
 mkdir -p "$TARGET_DIRECTORY"
+mkdir -p "$TARGET_DIRECTORY/assets"
 printf "Writing $PACK..."
 printf "{\"$PACK\":{" > "$TARGET_DIRECTORY/$PACK.json"
 shopt -s nullglob
 for i in $INPUT/*.png $INPUT/*.jpg $INPUT/*.gif $INPUT/*.svg; do
 	FILE="$(basename "${i%.*}")"
 	OUTNAME="$(sha256sum "$i" | awk '{ print $1 }').${i##*.}"
-	cp "$i" "$TARGET_DIRECTORY/$OUTNAME"
+	cp "$i" "$TARGET_DIRECTORY/assets/$OUTNAME"
 	printf "$FILE..."
 	printf "\"$FILE\":\"$OUTNAME\"," >> "$TARGET_DIRECTORY/$PACK.json"
 done