From 2a71edda370c670c5f7533609c8cc3883c87d74b Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sun, 30 Aug 2020 03:10:30 +0200
Subject: [PATCH] Update and rename v-replace-in-file to v-file-replace

---
 bin/v-file-replace    | 17 ++++++++++++++++
 bin/v-replace-in-file | 47 -------------------------------------------
 2 files changed, 17 insertions(+), 47 deletions(-)
 create mode 100644 bin/v-file-replace
 delete mode 100644 bin/v-replace-in-file

diff --git a/bin/v-file-replace b/bin/v-file-replace
new file mode 100644
index 000000000..c45609a0a
--- /dev/null
+++ b/bin/v-file-replace
@@ -0,0 +1,17 @@
+#!/usr/bin/php
+<?php
+
+include ("/usr/local/vesta/func/main.php");
+include ("/usr/local/vesta/func/string.php");
+
+myvesta_check_args (3, 'find replace file');
+
+echo "Find: ".$find."\n";
+echo "Replace: ".$replace."\n";
+echo "File: ".$file."\n";
+
+$r=myvesta_replace_in_file($file, $find, $replace);
+
+if ($r) echo "Replacing done!\n";
+
+exit(0);
diff --git a/bin/v-replace-in-file b/bin/v-replace-in-file
deleted file mode 100644
index 2162fd7b3..000000000
--- a/bin/v-replace-in-file
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/php
-<?php
-
-$current_user=exec('whoami', $output, $return_var);
-if ($current_user != 'root') {echo "You must be root to execute this script\n"; exit(1);}
-
-if (isset($argv)) {
-	if (count($argv)==4) {
-		$find=$argv[1];
-		$replace=$argv[2];
-		$file=$argv[3];
-	} else {
-		echo "Usage: v-replace-in-file 'findString' 'replaceString' file\n";
-		exit(2);
-	}
-}
-
-function fix_backslashes($s) {
-	$s=str_replace("\\n", "\n", $s);
-	$s=str_replace("\\r", "\r", $s);
-	$s=str_replace("\\t", "\t", $s);
-	return $s;
-}
-
-$find=fix_backslashes($find);
-$replace=fix_backslashes($replace);
-
-echo "Find: ".$find."\n";
-echo "Replace: ".$replace."\n";
-echo "File: ".$file."\n";
-
-if (!file_exists($file)) {
-	echo "ERROR: File not found!\n";
-	exit(3);
-}
-
-$buf=file_get_contents($file);
-
-if (strpos($buf, $find)===false) {
-	echo "ERROR: String not found!\n";
-	exit(4);
-}
-
-$buf=str_replace($find, $replace, $buf);
-$r=file_put_contents($file, $buf);
-if ($r) echo "Done.\n";
-exit(0);