From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 29 Nov 2018 04:10:05 +0000 (-0500)
Subject: Move testargs to bin
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e02295e8e8e21562320f87a70921fe528b57eda3;p=friendica.git

Move testargs to bin
---

diff --git a/bin/testargs.php b/bin/testargs.php
new file mode 100644
index 0000000000..a0ddea3452
--- /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 b84bcd916e..2fd04523d9 100644
--- 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
index a0ddea3452..0000000000
--- 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 '';
-}