From 359205a6fc0a3f892aa426b6c7852fd794f93ff5 Mon Sep 17 00:00:00 2001
From: skhademcis <43582925+skhademcis@users.noreply.github.com>
Date: Fri, 4 Feb 2022 19:05:45 -0500
Subject: [PATCH] Update encore.sh

---
 encore.sh | 61 +++++++++----------------------------------------------
 1 file changed, 10 insertions(+), 51 deletions(-)

diff --git a/encore.sh b/encore.sh
index b9d417a..e15198c 100644
--- a/encore.sh
+++ b/encore.sh
@@ -6,7 +6,7 @@
 # vars
 pid=-1
 configFilepath="estreamer.conf"
-pybin="python"
+pybin="python3"
 basepath="."
 isRunning=0
 
@@ -58,46 +58,8 @@ setup() {
 }
 
 init() {
-    pythonVersion=`$pybin -V 2>&1 | grep "Python 2.7"`
-    if [ "$pythonVersion" != "" ]
-    then
-        : #echo 'Python 2.7 is installed'
-    else
-        echo 'Python 2.7 is not available'
-        echo
-        echo 'It may be that you have both or neither python 2.x and 3.x installed but that your'
-        echo 'environment is not set up correctly. To see:'
-        echo
-        echo '    which python'
-        echo 'and'
-        echo '    whereis python'
-        echo
-        echo 'It is also possible that you have conflicting versions of python installed.'
-        echo 'Wherever possible, try to use a default system install located at /usr/bin/python'
-        echo
-        exit $EXIT_CODE_ERROR
-    fi
-
-    # This only seems necessary on Linux outside of Splunk
-    pyMaxUnicodeOk=`$pybin -c 'import sys; print(0x10000 < sys.maxunicode)'`
-    if [ "$pyMaxUnicodeOk" = "False" ]
-    then
-        pyPath=`which python`
-
-        echo 'Incompatible build of python'
-        echo
-        echo 'eNcore requires the standard version of python built with PyUnicodeUCS4. You are'
-        echo 'seeing this error message because the currently executing version of python'
-        echo "($pyPath) is built with PyUnicodeUCS2."
-        echo
-        echo 'This is a known issue in certain cases when running as the splunk user (more here:'
-        echo 'https://answers.splunk.com/answers/327336/why-am-i-getting-importerror-undefined-symbol-pyun.html)'
-        echo
-        echo 'The solution is to create a new user with the standard python environment and run'
-        echo 'as that user.'
-        echo
-        exit $EXIT_CODE_ERROR
-    fi
+    pythonVersion=`$pybin -V 2>&1 | grep "Python 3*"`
+#    echo "Python Version " + sys.version()
 
     if [ ! -e "$configFilepath" ]
     then
@@ -112,8 +74,6 @@ init() {
         exit $EXIT_CODE_ERROR
     fi
 
-    $configure --enabled=true
-
     pidFile=`$configure --print pidFile`
     pid=`$configure --print pid`
 
@@ -194,9 +154,8 @@ stop() {
     fi
 }
 
-clean() {
-    # Delete data older than 12 hours -> 720mins
-    find ../../data -type f -mmin +720 -delete
+ts() {
+    tar -zcvf ../"encore-ts-$(date '+%Y-%m-%d_%H-%M-%S%z(%Z)').tar.gz" *
 }
 
 restart() {
@@ -222,14 +181,14 @@ main() {
             diagnostics
             ;;
 
-        clean)
-            clean
-            ;;
-
         foreground)
             foreground
             ;;
-
+	
+        ts)
+	        ts
+	        ;;
+	     
         setup)
             setup
             ;;