add fail sequences

diff --git a/iso2ps2 b/iso2ps2
index 68ab00c30877f9e3c4c2700847e15143c8440f5f..9418824f92cf618c94c6ba27feaeccaa4dd5a455 100755 (executable)
--- a/iso2ps2
+++ b/iso2ps2
@@ -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,17 +170,17 @@ 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 package.conf . )
+( cd $serial; $PSNPACKAGE package.conf . ) || fail "can't create package"
 mv $serial/$cid.pkg .
 
 # cleaning
-#title "cleaning"
-#rm -rf $serial
+title "cleaning"
+rm -rf $serial