Fixed a silly path error on my part

toland · Mar 29, 2014 · 933f586 · 933f586
1 parent e309739
commit 933f586
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/QLMarkdown.xcodeproj/project.pbxproj b/QLMarkdown.xcodeproj/project.pbxproj
@@ -289,7 +289,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/Volumes/HD2/Users/sammyd/Documents/Projects/qlmarkdown/discount-config/update.sh";
+			shellScript = "$(SRCROOT)/discount-config/update.sh";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/discount-config/update.sh b/discount-config/update.sh
@@ -1,23 +1,31 @@
 #!/bin/bash
 
 status_msg () {
-	echo -e "\033[1m$1\033[0m"
+	if [ -t FD ] ; then
+		echo -e "\033[1m$1\033[0m"
+	else
+		echo "$1"
+	fi
 }
 
 error_msg () {
-	echo -e "\033[31m$1\033[0m" >&2
+	if [ -t FD ] ; then
+		echo -e "\033[31m$1\033[0m" >&2
+	else
+		echo "$1" >&2
+	fi
+
 	tput sgr0
 }
 
-status_msg "Running configure.sh..."
-
 # Checkout the discount module if necessary
-if [ ! -d discount ] ; then 
-	echo Updating the discount directory...
+if [[ ! -a $PWD/discount/configure.sh ]] ; then
+	status_msg "Updating the discount directory..."
 	git submodule update --init
 fi
 
-cd `dirname $0`/../discount/
+status_msg "Running configure.sh..."
+cd discount
 ./configure.sh --with-fenced-code
 
 # make the blocktags