fix y.sh script

[16.git] / y.sh

diff --git a/y.sh b/y.sh
index 19ed62f34e0b33c64bbd500753b415c2ce304c9e..40b4278d88b338aef52413adb96a24c8d9210bce 100755 (executable)
--- a/y.sh
+++ b/y.sh
@@ -1,7 +1,16 @@
+#!/bin/bash
+
+# run this from the top dir of the project
+topdir=`pwd`
+
+# force rebuild of the project
 wmake clean
-cd src/lib/doslib
+# force rebuild of doslib, make sure the latest is checked out from master
+cd "$topdir/src/lib/doslib" || exit 1
 git pull
 git checkout master
 git pull
-. ./buildall.sh clean
-. ./wbuild.sh
+./buildall.sh clean
+# back to top dir, build project again
+cd "$topdir" || exit 1
+./wbuild.sh