Add option to skip framework installation.

horde · Jan 21, 2015 · 567fbc3 · 567fbc3
1 parent 7aa90a8
commit 567fbc3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/framework/bin/install_dev b/framework/bin/install_dev
@@ -19,12 +19,12 @@ array_shift($argv);
 
 /* Defaults */
 $apps = array();
-$debug = $git = false;
+$debug = $git = $no_framework = false;
 $horde_git = $static_group = $web_dir = '';
 $static_mode = 0775;
 
 if (count($argv)) {
-    $options = $c->getopt2($argv, '', array('apps=', 'config=', 'debug', 'git', 'group=', 'hordegit=', 'mode=', 'webdir='));
+    $options = $c->getopt2($argv, '', array('apps=', 'config=', 'debug', 'git', 'group=', 'hordegit=', 'mode=', 'noframework=', 'webdir='));
     if ($options instanceof PEAR_Error) {
         exit("Invalid arguments.\n");
     }
@@ -59,6 +59,10 @@ if (count($argv)) {
             $mode = $val[1];
             break;
 
+        case '--noframework':
+            $no_framework = $val[1];
+            break;
+
         case '--webdir':
             $web_dir = $val[1];
             break;
@@ -190,6 +194,8 @@ if ($apps) {
     }
 }
 
-print "\nLINKING framework\n";
-mkdir($web_dir . '/libs');
-system(__DIR__ . '/install_framework --src ' . escapeshellarg($horde_git) . '/framework --dest ' . escapeshellarg($web_dir . '/libs') . ' --horde ' . escapeshellarg($web_dir));
+if (!$no_framework) {
+    print "\nLINKING framework\n";
+    mkdir($web_dir . '/libs');
+    system(__DIR__ . '/install_framework --src ' . escapeshellarg($horde_git) . '/framework --dest ' . escapeshellarg($web_dir . '/libs') . ' --horde ' . escapeshellarg($web_dir));
+}
diff --git a/framework/bin/install_dev.conf.dist b/framework/bin/install_dev.conf.dist
@@ -11,6 +11,9 @@ $git = false;
 // The list of apps to create symlinks for
 $apps = array();
 
+// Don't install framework?
+$no_framework = false;
+
 // The location of the horde-git repository
 $horde_git = '';