Move testargs to bin

diff --git a/bin/testargs.php b/bin/testargs.php
new file mode 100644 (file)
index 0000000..a0ddea3
--- /dev/null
+++ b/bin/testargs.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ *
+ * File: testargs.php
+ *
+ * Purpose:
+ * During installation we need to check if register_argc_argv is
+ * enabled for the command line PHP processor, because otherwise
+ * deliveries will fail. So we will do a shell exec of php and
+ * execute this file with a command line argument, and see if it
+ * echoes the argument back to us. Otherwise notify the person
+ * that their installation doesn't meet the system requirements.
+ *
+ */
+
+
+if (($_SERVER["argc"] > 1) && isset($_SERVER["argv"][1])) {
+       echo $_SERVER["argv"][1];
+} else {
+       echo '';
+}

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index b84bcd9..2fd0452 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -266,7 +266,7 @@ class Installer
 
                if ($passed2) {
                        $str = Strings::getRandomName(8);
-                       $cmd = "$phppath util/testargs.php $str";
+                       $cmd = "$phppath bin/testargs.php $str";
                        $result = trim(shell_exec($cmd));
                        $passed3 = $result == $str;
                        $help = "";

diff --git a/util/testargs.php b/util/testargs.php
deleted file mode 100644 (file)
index a0ddea3..0000000
--- a/util/testargs.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- *
- * File: testargs.php
- *
- * Purpose:
- * During installation we need to check if register_argc_argv is
- * enabled for the command line PHP processor, because otherwise
- * deliveries will fail. So we will do a shell exec of php and
- * execute this file with a command line argument, and see if it
- * echoes the argument back to us. Otherwise notify the person
- * that their installation doesn't meet the system requirements.
- *
- */
-
-
-if (($_SERVER["argc"] > 1) && isset($_SERVER["argv"][1])) {
-       echo $_SERVER["argv"][1];
-} else {
-       echo '';
-}