Minor docker updates
Unified · Split
| @@ -254,7 +254,7 @@ $ docker run --rm -v $(pwd):/root \ · 253 unmodified lines | |||
| 254 | EOF | 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 | `/Retro68/toolchain/universal` first before attempting to access the file or URL specified | 258 | `/Retro68/toolchain/universal` first before attempting to access the file or URL specified |
| 259 | by INTERFACESFILE. This means that it is possible to use caching or another volume so that | 259 | by INTERFACESFILE. This means that it is possible to use caching or another volume so that |
| 260 | the universal interfaces are only processed once to speed up builds e.g. | 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 | UNIXFULLPATH="$UNIXPATH$LINE" | 65 | UNIXFULLPATH="$UNIXPATH$LINE" |
| 66 | 66 | ||
| 67 | echo "Copying $HFSFULLPATH to $UNIXFULLPATH" | 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 | if [[ $HFSPATH == *SharedLibraries: ]]; | 68 | if [[ $HFSPATH == *SharedLibraries: ]]; |
| 75 | then | 69 | then |
| 76 | if [[ ! -d $UNIXPATH.rsrc ]]; | 70 | # interfaces-and-libraries.sh can detect and use PPC libraries in |
| 77 | then | 71 | # MacBinary format |
| 78 | mkdir $UNIXPATH.rsrc | ||
| 79 | fi | ||
| 80 | |||
| 81 | # First copy as Macbinary | ||
| 82 | hcopy -m $HFSFULLPATH $UNIXFULLPATH.bin | 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 | else | 73 | else |
| 74 | # Otherwise copy files in raw format | ||
| 93 | hcopy -r $HFSFULLPATH $UNIXFULLPATH | 75 | hcopy -r $HFSFULLPATH $UNIXFULLPATH |
| 94 | fi | 76 | fi |
| 95 | fi | 77 | fi |