Fixed propel-gen script

propelorm · May 29, 2012 · 3b15493 · 3b15493
1 parent 3849529
commit 3b15493
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/generator/bin/propel-gen b/generator/bin/propel-gen
@@ -58,8 +58,13 @@ if [ -z "$PROPEL_GEN_HOME" ] ; then
 
 fi
 
+# Composer install?
 if [ -d "vendor/phing/phing" ] ; then
-    export PHING_COMMAND="$PROPEL_GEN_HOME/bin/phing.php"
+    if [ -f "$PROPEL_GEN_HOME/bin/phing.php" ] ; then
+        export PHING_COMMAND="$PROPEL_GEN_HOME/bin/phing.php"
+    else
+        export PHING_COMMAND="$PROPEL_GEN_HOME/vendor/propel/propel1/generator/bin/phing.php"
+    fi
 fi
 
 if [ -z "$PHING_COMMAND" ] ; then