Merge branch 'comptime-no-fail' into 'master'

Minor comptime refactoring.

See merge request STJr/SRB2!1776

(cherry picked from commit dc02339cc9)

9bfc82a1 Prevent comptime.* from failing compilation
a614865d Make comptime.sh conform to POSIX and less redundant, among other improvements
b7711b2b Pass argument list directly to functions that use them; quote arguments when used.

comptime.sh

@@ -1,54 +1,44 @@
-#!/bin/bash -e
+#!/bin/sh
 path="."
 if [ x"$1" != x ]; then
 	path="$1"
 fi
 
-versiongit() {
+version() {
-	gitbranch=`git rev-parse --abbrev-ref HEAD`
+	cat <<EOF > "$path/comptime.h"
-	gitversion=`git rev-parse HEAD`
-	cat <<EOF > $path/comptime.h
 
 // Do not edit!  This file was autogenerated
 // by the $0 script with git
 //
-const char* compbranch = "$gitbranch";
+const char* compbranch = "$1";
-const char* comprevision = "${gitversion:0:8}";
+const char* comprevision = "$2";
 EOF
-exit 0
+}
+
+versiongit() {
+	gitbranch="$(git rev-parse --abbrev-ref HEAD)"
+	gitversion="$(git rev-parse HEAD | cut -c -8)"
+	version "$gitbranch" "$gitversion";
+	exit 0
 }
 
 versionsvn() {
-	svnrevision=`svnversion -n $1`
+	svnrevision="$(svnversion -n "$1")"
-	cat <<EOF > $path/comptime.h
+	version "Subversion" "r$svnrevision";
-
+	exit 0
-// Do not edit!  This file was autogenerated
-// by the $0 script with subversion
-//
-const char* compbranch = "Subversion";
-const char* comprevision = "r$svnrevision";
-EOF
-exit 0
 }
 
 versionfake() {
-	cat <<EOF > $path/comptime.h
+	version "Unknown" "illegal";
-
-// Do not edit!  This file was autogenerated
-// by the $0 script with an unknown or nonexist SCM
-//
-const char* compbranch = "Unknown";
-const char* comprevision = "illegal";
-EOF
 }
 
 compversion() {
-touch $path/comptime.c
+	touch "$path/comptime.c"
-versionfake
+	versionfake
-test -d $path/.svn && versionsvn
+	[ -d "$path/.svn" ] && versionsvn "$@"
-test -d $path/../.git && versiongit
+	[ -d "$path/../.git" ] && versiongit
-exit 1
+	exit 1
 }
 
-test -f $path/comptime.c && compversion
+[ -f "$path/comptime.c" ] && compversion "$@"
 exit 2

src/Makefile

@@ -357,9 +357,9 @@ $(dbg).txt : $(dbg)
 # this really updates comptime.h
 comptime.c ::
 ifdef WINDOWSHELL
-	$(.)..\comptime.bat .
+	-$(.)..\comptime.bat .
 else
-	$(.)../comptime.sh .
+	-$(.)../comptime.sh .
 endif
 
 # I wish I could make dependencies out of rc files :(