X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=iso2ps2;h=fd26b5f89de4288761695e122168520f2e837982;hb=2484479bde3c77783fc8d8eafb9fa973005a564d;hp=a77f938d9a31ded41a44b812b9fd4efa50b569ea;hpb=7b62e5c6692e8f33861278da40f33e79805d259b;p=iso2ps2.git

diff --git a/iso2ps2 b/iso2ps2
index a77f938..fd26b5f 100755
--- a/iso2ps2
+++ b/iso2ps2
@@ -3,6 +3,8 @@
 # default values
 PROGNAME=$(basename $0)
 KLICENSE="e4e54fd67c16c316f47829a30484d843"
+PS2CLASSIC=ps2classic/ps2classic
+PSNPACKAGE=psn_package_npdrm/psn_package_npdrm
 
 # defaut values
 id=0
@@ -52,7 +54,6 @@ echo "Title: '$title'"
 mkdir $serial
 tar -C $serial -xzf skeleton.tgz
 
-
 # images:
 # - ICON0.PNG 320x176
 # - PIC0.PNG 1000x560
@@ -71,7 +72,7 @@ fi
 # screenshot
 touch .touch
 find $HOME/.config/PCSX2/snaps/ -type f | xargs rm .touch
-#pcsx2 "$file"
+pcsx2 "$file"
 capture=$(find $HOME/.config/PCSX2/snaps/ -type f | sort)
 if [ "$capture" ]; then
     cp "$capture" tmp.png
@@ -90,7 +91,21 @@ echo -n $title | xxd | xxd -r -s 0x108 - $serial/PARAM.SFO
 echo -n $CID | xxd | xxd -r -s 0x188 - $serial/PARAM.SFO
 echo -n $CID | xxd | xxd -r -s 0x17- $serial/USRDIR/ISO.BIN.EDAT
 
-# convert
+# generate key
 dd bs=1 count=$(expr ${#KLICENSE} / 2) if=/dev/zero of=$serial/ps2.key
 echo "00000000  $KLICENSE" | xdd -r - > $serial/ps2.key
-ps2classic e cex $serial/ps2.key "$1" $serial/USRDIR/ISO.BIN.ENC ISO.BIN.ENC 2P0001-${CID}_00-0000111122223333
+
+# package config
+echo > $serial/package.conf << EOF
+Content-ID = $CID
+k_licensee = 0x$KLICENSE
+DRM_Type = Free
+Content_Type = Game_Data
+PackageVersion = 01.01
+EOF
+
+# convert iso
+$PS2CLASSIC e cex $serial/ps2.key "$1" $serial/USRDIR/ISO.BIN.ENC ISO.BIN.ENC 2P0001-${CID}_00-0000111122223333
+
+# create package
+$PSNPACKAGE $serial