From ba949cc02bdb8df70d56988282240a27b84bb3b4 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Sat, 2 Feb 2019 17:09:52 -0800
Subject: [PATCH] Fix filetypes in packages, tweak cases. Fixes #123

---
 res/package.sh | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/res/package.sh b/res/package.sh
index e470cfa..9c731f1 100755
--- a/res/package.sh
+++ b/res/package.sh
@@ -8,11 +8,12 @@ set -e
 CADIUS="${CADIUS:-$HOME/dev/cadius/bin/release/cadius}"
 
 DAS=$(cat desk.acc/TARGETS)
+PRS=$(cat preview/TARGETS)
 
 PACKDIR="out/package"
 FINFO="$PACKDIR/_FileInformation.txt"
 IMGFILE="out/A2DeskTop.po"
-VOLNAME="A2.DESKTOP"
+VOLNAME="A2.DeskTop"
 
 mkdir -p "$PACKDIR"
 echo "" > "$FINFO"
@@ -22,30 +23,41 @@ echo "" > "$FINFO"
 
 for file in $DAS; do
     ucfile=$(echo $file | tr a-z A-Z)
-    echo "$ucfile=Type(F1),AuxType(0640),VersionCreate(00),MinVersion(B9),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)" >> "$FINFO"
+    echo "$ucfile=Type(F1),AuxType(0640),VersionCreate(00),MinVersion(00),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)" >> "$FINFO"
     cp "desk.acc/out/$file.built" "out/package/$ucfile"
 done
+for file in $PRS; do
+    ucfile=$(echo $file | tr a-z A-Z)
+    echo "$ucfile=Type(F1),AuxType(0640),VersionCreate(00),MinVersion(00),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)" >> "$FINFO"
+    cp "preview/out/$file.built" "out/package/$ucfile"
+done
 
-cat > "$FINFO" <<EOF
-DESKTOP.SYSTEM=Type(FF),AuxType(0),VersionCreate(00),MinVersion(B9),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)
-DESKTOP2=Type(F1),AuxType(0),VersionCreate(00),MinVersion(B9),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)
+cat >> "$FINFO" <<EOF
+DeskTop.system=Type(FF),AuxType(0),VersionCreate(00),MinVersion(00),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)
+DeskTop2=Type(F1),AuxType(0),VersionCreate(00),MinVersion(00),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000)
 EOF
 
-cp "desktop.system/out/desktop.system.SYS" "$PACKDIR/DESKTOP.SYSTEM"
-cp "desktop/out/DESKTOP2.built" "$PACKDIR/DESKTOP2"
+cp "desktop.system/out/desktop.system.SYS" "$PACKDIR/DeskTop.system"
+cp "desktop/out/DESKTOP2.built" "$PACKDIR/DeskTop2"
 
 # Create a new disk image.
 
 $CADIUS CREATEVOLUME $IMGFILE $VOLNAME 800KB
-$CADIUS CREATEFOLDER $IMGFILE "/$VOLNAME/DESK.ACC"
+$CADIUS CREATEFOLDER $IMGFILE "/$VOLNAME/Desk.Acc"
+$CADIUS CREATEFOLDER $IMGFILE "/$VOLNAME/Preview"
 
 # Add the files into the disk image.
 
 for file in $DAS; do
     ucfile=$(echo $file | tr a-z A-Z)
-    $CADIUS ADDFILE $IMGFILE "/$VOLNAME/DESK.ACC" $PACKDIR/$ucfile
+    $CADIUS ADDFILE $IMGFILE "/$VOLNAME/Desk.Acc" $PACKDIR/$ucfile
 done
 
-for file in DESKTOP.SYSTEM DESKTOP2; do
+for file in $PRS; do
+    ucfile=$(echo $file | tr a-z A-Z)
+    $CADIUS ADDFILE $IMGFILE "/$VOLNAME/Preview" $PACKDIR/$ucfile
+done
+
+for file in DeskTop.system DeskTop2; do
     $CADIUS ADDFILE $IMGFILE "/$VOLNAME" $PACKDIR/$file
 done