Fix installer breakage

rhalkyard · Mar 6, 2024 · 1d4e3fe · 1d4e3fe
1 parent 67e1b85
commit 1d4e3fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/installer/Build.mpw b/installer/Build.mpw
@@ -3,9 +3,6 @@ Set TYPECREATOR "-t bbkr -c bbkr"
 Set REZFLAGS "{TYPECREATOR} -I '{RIncludes}' -d currentDate=`Date -n`"
 Set LINKFLAGS "{TYPECREATOR}"
 
-#C {CFLAGS} -o checkSE.o checkSE.c
-#Link {LINKFLAGS} -rt infn=13000 -o 'Installer Script' checkSE.o
-
 # Compile our script resources. For some reason, Retro68's Rez does not like the
 # InstallerTypes.r include file, so we have to do this bit in MPW.
 Rez {REZFLAGS} -a -o 'Installer Script' filespecs.r 

diff --git a/installer/build.sh b/installer/build.sh
@@ -121,7 +121,6 @@ SOURCE_FILES=(
     "misc.r" 
     "packages.r" 
     "rules.r" 
-    "checkSE.c"
     "Build.mpw"
     "$BUILDDIR/software/shared/version/include/version.h")
 
@@ -133,7 +132,7 @@ SOURCE_FILES=(
 declare -A BINARY_FILES=(
     ["$BUILDDIR/software/driver/SEthernet.bin"]=':SEthernet Files:SEthernet Resources'
     ["$BUILDDIR/software/driver/SEthernet30.bin"]=':SEthernet Files:SEthernet/30'
-    ["$BUILDDIR/software/toosl/programROM/programROM.bin"]=':ProgramROM')
+    ["$BUILDDIR/software/tools/programROM/programROM.bin"]=':ProgramROM')
 
 hmount buildenv.dsk >/dev/null
 

diff --git a/installer/identifiers.r b/installer/identifiers.r
@@ -115,9 +115,9 @@
 #define pkEtherTalkNBCustom 14000
 #define pkMacTCP 13000
 #define pkSEthernet30 13001
-#define pkSEthernet30Custom 13000
-#define pkSEthernet 13002
-#define pkSEthernetCustom 13003
+#define pkSEthernet30Custom 13002
+#define pkSEthernet 13003
+#define pkSEthernetCustom 13004
 
 /* Package Comments */
 #define cmAppleTalkSystem6 14016

diff --git a/installer/rules.r b/installer/rules.r
@@ -706,13 +706,12 @@ resource 'inrl' (rlSEthernet) {
 					asSystem7
 				}
 			},
-			/*
-			checkUserFunction {
-				'infn',
-				13000,
-				0x800000
+			checkGestalt {
+				'mach', /* gestaltMachineType */
+				{ 
+					5	/* gestaltMacSE */
+				}
 			},
-			*/
 			addAssertion {
 				{
 					asInstallAppleTalk,