X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fms_root_dir.sh;h=6f7d21e3b7fdf6ebe89d8ec42496652642e2790a;hb=refs%2Fheads%2Frelease-2.140.128;hp=7e604407d191fec22d0b2449118d3ae936b1cf7d;hpb=abad259144d11f1a8a752f14ae8a79968a073c89;p=feisty_meow.git

diff --git a/scripts/clam/cpp/ms_root_dir.sh b/scripts/clam/cpp/ms_root_dir.sh
old mode 100755
new mode 100644
index 7e604407..6f7d21e3
--- a/scripts/clam/cpp/ms_root_dir.sh
+++ b/scripts/clam/cpp/ms_root_dir.sh
@@ -2,7 +2,7 @@
 # spits out the root directory of visual studio, calculated from the common
 # tools directory that always seems to be reliably set.
 
-# code stolen from vis_stu_vars...
+# code snagged from vis_stu_vars...
 if [ -z "$VSxTOOLS" ]; then
   export VSxTOOLS="$VS90COMNTOOLS"
   if [ -z "$VSxTOOLS" ]; then
@@ -10,9 +10,10 @@ if [ -z "$VSxTOOLS" ]; then
   fi
 fi
 if [ -z "$VSxTOOLS" ]; then
-  echo Failure to locate visual studio tools.
+  #echo Failure to locate visual studio tools.
+  # don't want to echo anything; need to be able to check that this provided nothing.
   exit 33
 fi
 
-short_path "$VSxTOOLS" | sed -e 's/\\/\//g' | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/'
+cygpath -w -s "$VSxTOOLS" | sed -e 's/\\/\//g' | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/'