Merge pull request #260 from mcayland/fix/minor-docker-updates

Minor docker updates

Wolfgang Thaller committed 2 years ago

Commit 929acbb2 parents 7b597af 18ff16c2 files · +4 −22Browse files

Unified · Split

2 files

@@ -254,7 +254,7 @@ $ docker run --rm -v $(pwd):/root \ · 253 unmodified lines
254	254	EOF
255	255	```
256	256
257		−Note that `entrypoint.sh` checks to see if the universal interfaces are installed into
	257	+Note that `docker-entrypoint.sh` checks to see if the universal interfaces are installed into
258	258	`/Retro68/toolchain/universal` first before attempting to access the file or URL specified
259	259	by INTERFACESFILE. This means that it is possible to use caching or another volume so that
260	260	the universal interfaces are only processed once to speed up builds e.g.

@@ -65,31 +65,13 @@ while IFS= read -r LINE; do · 64 unmodified lines
65	65	UNIXFULLPATH="$UNIXPATH$LINE"
66	66
67	67	echo "Copying $HFSFULLPATH to $UNIXFULLPATH"
68		−
69		− # PPC libraries need a resource fork, but the code in
70		− # interfaces-and-libraries.sh doesn't correctly detect InterfaceLib in
71		− # Macbinary format. Work around this for now by using Basilisk II format
72		− # which can be parsed by ResourceFile and still allows the filename
73		− # detection logic to work.
74	68	if [[ $HFSPATH == *SharedLibraries: ]];
75	69	then
76		− if [[ ! -d $UNIXPATH.rsrc ]];
77		− then
78		− mkdir $UNIXPATH.rsrc
79		− fi
80		−
81		− # First copy as Macbinary
	70	+ # interfaces-and-libraries.sh can detect and use PPC libraries in
	71	+ # MacBinary format
82	72	hcopy -m $HFSFULLPATH $UNIXFULLPATH.bin
83		−
84		− # Extract data fork using normal name
85		− bash -c "cd $UNIXPATH && macunpack -d $UNIXFULLPATH.bin && mv $UNIXFULLPATH.data $UNIXFULLPATH"
86		−
87		− # Extract resource fork into .rsrc directory
88		− bash -c "cd $UNIXPATH && macunpack -r $UNIXFULLPATH.bin && mv $UNIXFULLPATH.rsrc $UNIXPATH.rsrc/$LINE"
89		−
90		− # Delete original Macbinary
91		− rm -rf $UNIXFULLPATH.bin
92	73	else
	74	+ # Otherwise copy files in raw format
93	75	hcopy -r $HFSFULLPATH $UNIXFULLPATH
94	76	fi
95	77	fi

Keyboard shortcuts