Build: Restore READ.ME line endings after twiddling them

a2stuff · Mar 5, 2021 · 4684749 · 4684749
1 parent 3ca99d9
commit 4684749
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/bin/install b/bin/install
@@ -51,6 +51,7 @@ suppress cadius CREATEFOLDER "$INSTALL_IMG" "$INSTALL_PATH" --quiet --no-case-bi
 
 perl -p -i -e 's/\r?\n/\r/g' "res/package/READ.ME" # Ensure Apple line endings
 add_file "$INSTALL_IMG" "res/package/READ.ME" "$INSTALL_PATH" "Read.Me" 040000
+perl -p -i -e 's/\r/\n/g' "res/package/READ.ME" # Restore Unix line endings
 
 add_file "$INSTALL_IMG" "desktop.system/out/desktop.system.SYS" "$INSTALL_PATH" "DeskTop.system" FF0000
 add_file "$INSTALL_IMG" "desktop/out/desktop.built" "$INSTALL_PATH" "DeskTop2" F10000

diff --git a/bin/mount b/bin/mount
@@ -28,6 +28,7 @@ cecho yellow "Copying files to $MOUNT_DIR/"
 
 perl -p -i -e 's/\r?\n/\r/g' "res/package/READ.ME" # Ensure Apple line endings
 add_file "res/package/READ.ME" "READ.ME" 040000
+perl -p -i -e 's/\r/\n/g' "res/package/READ.ME" # Restore Unix line endings
 
 add_file "desktop.system/out/desktop.system.SYS" "DESKTOP.SYSTEM" FF0000
 add_file "desktop/out/desktop.built" "DESKTOP2" F10000

diff --git a/bin/package b/bin/package
@@ -67,6 +67,7 @@ fi
 perl -p -i -e 's/\r?\n/\r/g' "res/package/READ.ME" # Ensure Apple line endings
 add_file $IMGFILE_COMPLETE "res/package/READ.ME" "/$VOLNAME_COMPLETE" "Read.Me" 040000
 add_file $IMGFILE_PART1 "res/package/READ.ME" "/$VOLNAME_PART1" "Read.Me" 040000
+perl -p -i -e 's/\r/\n/g' "res/package/READ.ME" # Restore Unix line endings
 
 add_file $IMGFILE_COMPLETE "desktop.system/out/desktop.system.SYS" "/$VOLNAME_COMPLETE" "DeskTop.system" FF0000
 add_file $IMGFILE_PART1 "desktop.system/out/desktop.system.SYS" "/$VOLNAME_PART1" "DeskTop.system" FF0000

diff --git a/bin/shk b/bin/shk
@@ -31,6 +31,8 @@ cecho yellow "Copying files..."
 
 perl -p -i -e 's/\r?\n/\r/g' "res/package/READ.ME" # Ensure Apple line endings
 add_file "res/package/READ.ME" "READ.ME" 040000
+perl -p -i -e 's/\r/\n/g' "res/package/READ.ME" # Restore Unix line endings
+
 
 add_file "desktop.system/out/desktop.system.SYS" "DESKTOP.SYSTEM" FF0000
 add_file "desktop/out/desktop.built" "DESKTOP2" F10000

diff --git a/res/package/READ.ME b/res/package/READ.ME
@@ -1 +1,18 @@
-For more information about Apple II DeskTop, visit:        https://a2desktop.comFull documentation can be found at:        https://a2desktop.com/docsReleases can be found at:        https://github.com/a2stuff/a2d/releasesTranslations thanks to:    Italian - The Dipo     French - Brutal Deluxe    Spanish - Javmaster     German - Mathias Grunner
+For more information about Apple II DeskTop, visit:
+
+        https://a2desktop.com
+
+Full documentation can be found at:
+
+        https://a2desktop.com/docs
+
+Releases can be found at:
+
+        https://github.com/a2stuff/a2d/releases
+
+Translations thanks to:
+
+    Italian - The Dipo
+     French - Brutal Deluxe
+    Spanish - Javmaster
+     German - Mathias Grunner