better title enlightning

[iso2ps2.git] / iso2ps2

diff --git a/iso2ps2 b/iso2ps2
index 88000348fa98bb9a199de1b006c02ed017cd2aeb..8f872f5f39c8d32acb0b001342e2e7735ce80feb 100755 (executable)
--- a/iso2ps2
+++ b/iso2ps2
@@ -15,7 +15,7 @@ PSNPACKAGE=$PWD/psn_package_npdrm/psn_package_npdrm
 MODEL="ULTRA"
 
 # formating functions
-function title () { echo -e "\033[0;1m$*\033[0;0m"; }
+function title () { echo -e "\033[0;1m=== $* ===\033[0;0m"; }
 function pass () { echo -e "\033[1;32m$*\033[0;0m"; }
 function warn () { echo -e "\033[1;33m$*\033[0;0m"; }
 function fail () { echo -e "\033[1;31m$*\033[0;0m"; exit 1; }
@@ -75,7 +75,7 @@ echo "CID: $cid"
 title "install skeleton"
 mkdir $serial
 tar -C $serial -xzf skeleton.tgz
-[ -d $CACHE ] || mkdir $CACHE
+[ -d "$CACHE" ] || mkdir "$CACHE"
 
 # images:
 # - ICON0.PNG 320x176
@@ -84,8 +84,8 @@ tar -C $serial -xzf skeleton.tgz
 
 # get cover image
 title "get cover image"
-if [ -f $CACHE/$serial-ICON0.PNG ]; then
-    cp $CACHE/$serial-ICON0.PNG $serial/ICON0.PNG
+if [ -f "$CACHE/$serial-ICON0.PNG" ]; then
+    cp "$CACHE/$serial-ICON0.PNG" $serial/ICON0.PNG
 else
     wget https://psxdatacenter.com/psx2/images2/covers/$serial.jpg
     if [ -f $serial.jpg ]; then
@@ -94,7 +94,7 @@ else
         mogrify -background transparent -gravity center -extent 320x176 tmp.png
         mv tmp.png $serial/ICON0.PNG
         rm $serial.jpg
-        cp $serial/ICON0.PNG $CACHE/$serial-ICON0.PNG
+        cp $serial/ICON0.PNG "$CACHE/$serial-ICON0.PNG"
     else
         warn "can't find cover"
     fi
@@ -102,8 +102,8 @@ fi
 
 # get screenshot
 title "get screenshot"
-if [ $CACHE/$serial-PIC0.PNG ]; then
-    cp $CACHE/$serial-PIC0.PNG $serial/PIC0.PNG
+if [ -f "$CACHE/$serial-PIC0.PNG" ]; then
+    cp "$CACHE/$serial-PIC0.PNG" $serial/PIC0.PNG
 else
     touch .touch
     find $HOME/.config/PCSX2/snaps/ -type f | xargs rm .touch
@@ -114,7 +114,7 @@ else
         mogrify -scale 1000x560 tmp.png
         mogrify -background transparent -gravity center -extent 1000x560 tmp.png
         mv tmp.png $serial/PIC0.PNG
-        cp $serial/PIC0.PNG $CACHE/$serial-PIC0.PNG
+        cp $serial/PIC0.PNG "$CACHE/$serial-PIC0.PNG"
     else
         warn "can't find screenshot"
     fi
@@ -140,16 +140,23 @@ echo "00000000  $KLICENSE" | xxd -r - $serial/ps2.key
 # find config file
 title "find config file"
 confname=$(echo $serial.CONFIG | sed 's/-/_/;s/_\(...\)/_\1./')
-case "$MODEL" in
-  FAT)
-      config=$(cd $CONFIGS; find GX -name $confname | head -1)
-      ;;
-  SLIM|SUPER|ULTRA)
-      config=$(cd $CONFIGS; find CUSTOM SOFT NET -name $confname | head -1)
-      ;;
-esac
-[ -f "CONFIGS/$config" ] || fail "can't find config"
-cp $CONFIGS/$config $serial/$confname
+if [ -f "$CACHE/$confname" ]; then
+    cp "$CACHE/$confname" $serial/$confname
+else
+    case "$MODEL" in
+    FAT)
+        config=$(cd $CONFIGS; find GX -name $confname | head -1)
+        ;;
+    SLIM|SUPER|ULTRA)
+        config=$(cd $CONFIGS; find CUSTOM SOFT NET -name $confname | head -1)
+        ;;
+    esac
+    if [ "$config" ]; then
+        cp $CONFIGS/$config "$CACHE/$confname"
+        cp "$CACHE/$confname" $serial/$confname
+    fi
+fi
+[ -f $serial/$confname ] || warn "can't find config"
 
 # create package config
 title "create package config"
@@ -163,15 +170,15 @@ EOF
 
 # prepare iso
 title "prepare iso"
-$PS2CLASSIC prepare "$file"
+$PS2CLASSIC prepare "$file" || fail "can't prepare iso"
 
 # convert iso
 title "convert iso"
-$PS2CLASSIC e cex $serial/ps2.key "$file" $serial/USRDIR/ISO.BIN.ENC ISO.BIN.ENC $cid
+$PS2CLASSIC e cex $serial/ps2.key "$file" $serial/USRDIR/ISO.BIN.ENC ISO.BIN.ENC $cid || fail "can't convert iso"
 
 # create package
 title "create package"
-( cd $serial; $PSNPACKAGE $confname package.conf . )
+( cd $serial; $PSNPACKAGE package.conf . ) || fail "can't create package"
 mv $serial/$cid.pkg .
 
 # cleaning