From b1a3b88877efe2dd8f22bc2a2e5454ee825c0635 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Tue, 28 Mar 2023 10:39:38 +0200
Subject: [PATCH] new line on the output end if v-php-func called directly from
 shell

---
 func/bash-to-php-interpreter.php | 6 ++++++
 func/main.php                    | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/func/bash-to-php-interpreter.php b/func/bash-to-php-interpreter.php
index 6ed31455..cd849d6c 100644
--- a/func/bash-to-php-interpreter.php
+++ b/func/bash-to-php-interpreter.php
@@ -1,5 +1,8 @@
 <?php
 
+if (isset($_SERVER['SHLVL'])) $SHLVL=intval($_SERVER['SHLVL']);
+else $SHLVL=3;
+
 if (!isset($argv)) exit(5);
 
 include ("/usr/local/vesta/func/main.php");
@@ -24,11 +27,14 @@ for ($i=2; $i<$counter; $i++) {
 $r=call_user_func_array($func, $params);
 if (is_bool($r)) {
     if ($r) {
+        if ($SHLVL<3) echo "\n";
         exit(0);
     } else {
+        if ($SHLVL<3) echo "\n";
         exit(MYVESTA_ERROR_GENERAL);
     }
 } else {
     echo $r;
+    if ($SHLVL<3) echo "\n";
     exit(0);
 }
diff --git a/func/main.php b/func/main.php
index cf13f3f0..ee4fb962 100644
--- a/func/main.php
+++ b/func/main.php
@@ -54,7 +54,7 @@ function myvesta_fix_args() {
 }
 
 function myvesta_exit($code) {
-    global $argv;
+    // global $argv;
     // echo "==================== ".$argv[0].": ".$code." ====================\n";
     exit($code);
 }
@@ -62,6 +62,5 @@ function myvesta_exit($code) {
 function myvesta_test_func () {
     $args=func_get_args();
     echo "You said: ";
-    print_r ($args);
-    echo "\n";
+    echo trim(print_r ($args, true));
 }