Merge branch 'fixDoubbleCommit' into 'pregmod-master'

Fix doubble commit and minor tweaking.

See merge request !5536

compile.sh

@@ -29,9 +29,7 @@ function echoMessage {
 
 #compile the HTML file
 function compile {
-
-	mkdir -p bin
-
+	mkdir -p bin/resources
 	export TWEEGO_PATH=devTools/tweeGo/storyFormats
 	TWEEGO_EXE="tweego"
 
@@ -65,18 +63,16 @@ function compile {
 			exit 2
 		esac
 	fi
-
+	
+	COMMIT=$(git rev-parse --short HEAD) # Find and insert current commit
 	if [[ "$usehash" ]]; then
-		HASH="$(git rev-list -n 1 --abbrev-commit HEAD)"
-		file="bin/FC_pregmod_${HASH}.html"
+		file="bin/FC_pregmod_${COMMIT}.html"
 	else
-		COMMIT=$(git rev-parse --short HEAD) # Find and insert current commit
-		sed -Ei "s/build .releaseID/\0 commit $COMMIT/" src/gui/mainMenu/AlphaDisclaimer.tw
+		sed -Ei "s/build: .releaseID/\0, commit: $COMMIT/" src/gui/mainMenu/AlphaDisclaimer.tw
 		file="bin/FC_pregmod.html"
 	fi
 
 	$TWEEGO_EXE -o $file src/ --head devTools/head.html || build_failed="true"
-
 	if [ "$build_failed" = "true" ]
 	then
 		echoError "Build failed."
@@ -85,9 +81,7 @@ function compile {
 
 	#Make the output prettier, replacing \t with a tab and \n with a newline
 	sed -i -e '/^.*<div id="store-area".*$/s/\\t/\t/g' -e '/^.*<div id="store-area".*$/s/\\n/\n/g' $file
-
-	mkdir -p bin/resources
-	if [[ ! "$usehash" ]]; then git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw;fi # Revert AlphaDisclaimer for next compilation
+	git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw # Revert AlphaDisclaimer for next compilation
 	echoMessage "Saved to $file."
 }
 

src/gui/mainMenu/AlphaDisclaimer.tw

 :: Alpha disclaimer
 
-//version $ver mod version $pmodVer build $releaseID commit 1f8996d09//
+//version: $ver, mod version: $pmodVer, build: $releaseID//
 @@.green;//Mod: expanded age ranges and other tweaks 2016-08-30//@@ @@.darkred;+SV@@
 @@.green;//Mod: extra preg content and other crap//@@
 
-''This is an alpha.'' That means the game is missing content, is full of bugs, is imbalanced, and is generally in an incomplete state. The game will keep a start of turn autosave. If you encounter a bug, we strongly recommend you reload your start of turn autosave immediately. Please submit your feedback and bug reports at https://gitgud.io/pregmodfan/fc-pregmod/issues/. Consider attaching a save file and screenshot of the problem. This Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/.
+@@.yellow;This is a text-based game that includes descriptions of sexual activity, graphic violence, drug use, and other subjects not suitable for persons under the age of 18. This is a work of fiction; any resemblance to actual persons, places, or events is unintended.@@
+
+''This is an alpha.'' That means the game is missing content, is full of bugs, is imbalanced, and is generally in an incomplete state. The game will keep a start of turn autosave. If you encounter a bug, we strongly recommend you reload your start of turn autosave immediately. Please submit your feedback and bug reports at https://gitgud.io/pregmodfan/fc-pregmod/issues/. Consider attaching a save file and screenshot of the problem. Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/.
 
 An in-game encyclopedia is available from the sidebar, with answers to most basic gameplay questions.
 
 __Important note for new players, and a reminder for FC veterans:__ when the player is offered a set of choices, the ''Continue'' button at the top of the left sidebar will almost always remain available. Using this to decline all the options presented is //not cheating.// If it's available, it's supposed to be available. It represents the player character politely bowing out of the situation.
 
-If you enjoy FC and feel like using your real-life ¤ to express gratitude, you can do so at https://www.patreon.com/freecitiesdev?ty=h. It's a tip jar, not support for more content. I'm doing this for fun; let's keep it that way.
-
 ''Saves from versions prior to 0.6 are not compatible.''
 
-@@.yellow;This is a text-based game that includes descriptions of sexual activity, graphic violence, drug use, and other subjects not suitable for persons under the age of 18. This is a work of fiction; any resemblance to actual persons, places, or events is unintended.@@
-
+[[I am 18 or more years of age, I understand, and I wish to continue|Economy Intro]]
\ No newline at end of file
-[[I am 18 or more years of age, I understand, and I wish to continue|Economy Intro]]