Author: jm
Date: 2011-06-19 22:28:57 -0700 (Sun, 19 Jun 2011)
New Revision: 25804

Modified:
   csplugins/trunk/toronto/jm/repacker/repack.sh
   csplugins/trunk/toronto/jm/repacker/wrap.sh
Log:
Fixed some more cygwin issues


Modified: csplugins/trunk/toronto/jm/repacker/repack.sh
===================================================================
--- csplugins/trunk/toronto/jm/repacker/repack.sh       2011-06-20 05:18:14 UTC 
(rev 25803)
+++ csplugins/trunk/toronto/jm/repacker/repack.sh       2011-06-20 05:28:57 UTC 
(rev 25804)
@@ -5,7 +5,7 @@
 }
 
 function rejar {
-    if [ -z `which cygpath` ]
+    if [ -z $(which cygpath) ]
     then
         jar cvf "$@"
     else

Modified: csplugins/trunk/toronto/jm/repacker/wrap.sh
===================================================================
--- csplugins/trunk/toronto/jm/repacker/wrap.sh 2011-06-20 05:18:14 UTC (rev 
25803)
+++ csplugins/trunk/toronto/jm/repacker/wrap.sh 2011-06-20 05:28:57 UTC (rev 
25804)
@@ -2,16 +2,26 @@
 
 BND_CMD=bnd
 
+function fixpath {
+    if [ -z $(which cygpath) ]
+    then
+        echo "$@"
+    else
+        cygpath -w "$@"
+    fi
+}
+
 for FILE in "$@"
 do
     FRAGMENT_HOST=$(basename ${FILE} -natives.jar)
     echo ${FRAGMENT_HOST}
     ./genheaders.py ${FILE} ${FRAGMENT_HOST}
+    JAR=$(fixpath ${FILE})
     if [ -f "${FILE}.properties" ]
     then
-        ${BND_CMD} wrap -properties "${FILE}.properties" "${FILE}"
+        ${BND_CMD} wrap -properties "${JAR}.properties" "${JAR}"
     else
-        ${BND_CMD} wrap "${FILE}"
+        ${BND_CMD} wrap "${JAR}"
     fi
 done
 

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to