Update holer client

Author: WisdomFamily

Binary/Go/holer-linux-x86.tar.gz

@@ -21,28 +21,26 @@
 # Holer Script
 # -----------------------------------------------------------------------------
 
-#---------------------------------------------------
-# *NOTE*: Update the below configurations with yours
-#---------------------------------------------------
-HOLER_HOME="@HOLER_HOME@"
-HOLER_ACCESS_KEY="@HOLER_ACCESS_KEY@"
-HOLER_SERVER_HOST="@HOLER_SERVER_HOST@"
-#---------------------------------------------------
-
 HOLER_OK=0
 HOLER_ERR=1
 HOLER_PID=""
 
+HOLER_HOME="@HOLER_HOME@"
 HOLER_LOG_DIR=$HOLER_HOME/logs
 HOLER_LOG=$HOLER_LOG_DIR/holer-client.log
 HOLER_BIN=$HOLER_HOME/holer-linux-amd64
+HOLER_CONF=$HOLER_HOME/holer.conf
 
 # Source function library
 INIT_FUNCTIONS="/etc/init.d/functions"
 if [ -f $INIT_FUNCTIONS ]; then
     . $INIT_FUNCTIONS
 fi
 
+if [ -f $HOLER_CONF ]; then
+    . $HOLER_CONF
+fi
+
 if [ ! -d $HOLER_LOG_DIR ]; then
     mkdir -p $HOLER_LOG_DIR
 fi

Binary/Go/holer-windows.tar.gz

@@ -24,6 +24,7 @@ Dim HOLER_LINE
 Dim HOLER_HOME
 Dim HOLER_LOG
 Dim HOLER_LOG_DIR
+Dim HOLER_CONTENTS
 
 Dim HOLER_ACCESS_KEY
 Dim HOLER_SERVER_HOST
@@ -32,17 +33,17 @@ Set HOLER_FSO = CreateObject("Scripting.FileSystemObject")
 Set HOLER_WSH = CreateObject("WScript.Shell")
 Set HOLER_ENV = HOLER_WSH.Environment("USER")
 
-HOLER_HOME = HOLER_ENV("HOLER_HOME")
 HOLER_ACCESS_KEY = HOLER_ENV("HOLER_ACCESS_KEY")
 HOLER_SERVER_HOST = HOLER_ENV("HOLER_SERVER_HOST")
+HOLER_HOME = HOLER_ENV("HOLER_HOME")
 
 If HOLER_HOME = Empty Then
     HOLER_HOME = HOLER_FSO.GetFolder(".").Path & "\"
-    HOLER_ENV("HOLER_HOME") = HOLER_HOME
 End If
 
 HOLER_BIN = "holer-windows-amd64.exe"
 HOLER_BIN_PATH = HOLER_HOME & HOLER_BIN
+HOLER_CONF = HOLER_HOME & "holer.conf"
 HOLER_LOG_DIR = HOLER_HOME & "logs"
 HOLER_LOG = HOLER_LOG_DIR & "\holer-client.log"
 HOLER_LINE = "------------------------------------------"
@@ -75,6 +76,7 @@ Function InputParam()
             WScript.Quit
         End If
         HOLER_ENV("HOLER_ACCESS_KEY") = HOLER_ACCESS_KEY
+        HOLER_CONTENTS = "HOLER_ACCESS_KEY=" & HOLER_ACCESS_KEY & vbCrLf
     End If
 
     If HOLER_SERVER_HOST = Empty Then
@@ -84,9 +86,25 @@ Function InputParam()
             WScript.Quit
         End If
         HOLER_ENV("HOLER_SERVER_HOST") = HOLER_SERVER_HOST
+        HOLER_CONTENTS = HOLER_CONTENTS & "HOLER_SERVER_HOST=" & HOLER_SERVER_HOST
+        WriteFile HOLER_CONF, HOLER_CONTENTS
     End If
 End Function
 
+'---------------------------------------------------
+' Write contents to file
+'---------------------------------------------------
+Function WriteFile(file, contents)
+    Dim OutStream, FSO
+
+    on error resume Next
+    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set OutStream = FSO.OpenTextFile(file, 2, True)
+
+    OutStream.Write contents
+    OutStream.close
+End Function
+
 '---------------------------------------------------
 ' Function - Launch holer program
 '---------------------------------------------------
@@ -100,6 +118,6 @@ Function LaunchHoler()
     '---------------------------------------------------
     ' Find holer daemon
     '---------------------------------------------------
-    HOLER_CMD = "cmd.exe /c echo Starting holer client... & timeout /T 4 /NOBREAK & echo " & HOLER_LINE & " & echo The running holer client: & tasklist | findstr " & HOLER_BIN & " & echo " & HOLER_LINE & " & pause"
+    HOLER_CMD = "cmd.exe /c echo Starting holer client... & timeout /T 3 /NOBREAK & echo " & HOLER_LINE & " & echo The running holer client: & tasklist | findstr " & HOLER_BIN & " & echo " & HOLER_LINE & " & pause"
     HOLER_WSH.Run HOLER_CMD, 1, True
 End Function

Binary/Go/scripts/holer

@@ -19,20 +19,11 @@
 # -----------------------------------------------------------------------------
 cd `dirname $0`
 
-HOLER_CONF=`pwd`/holer.conf
-if [ -f $HOLER_CONF ]; then
-    . $HOLER_CONF
-fi
-
-if [ "$HOLER_HOME" == "" ]; then
-    HOLER_HOME=`pwd`
-    echo "HOLER_HOME=$HOLER_HOME" > $HOLER_CONF
-fi
-
 HOLER_OK=0
 HOLER_ERR=1
-
 HOLER_NAME="holer"
+HOLER_HOME=`pwd`
+HOLER_CONF=$HOLER_HOME/holer.conf
 RC_INIT_DIR="/etc/rc.d/init.d"
 
 function input() 
@@ -45,7 +36,7 @@ function input()
             echo "Please enter holer access key."
             exit $HOLER_ERR
         fi
-        echo "HOLER_ACCESS_KEY=$HOLER_ACCESS_KEY" >> $HOLER_CONF
+        echo "HOLER_ACCESS_KEY=$HOLER_ACCESS_KEY" > $HOLER_CONF
     fi
 
     # Asking for the holer server host
@@ -66,8 +57,6 @@ function init()
 
     cp $HOLER_HOME/$HOLER_NAME $RC_INIT_DIR/
     sed -i "s|@HOLER_HOME@|$HOLER_HOME|" $RC_INIT_DIR/$HOLER_NAME
-    sed -i "s|@HOLER_ACCESS_KEY@|$HOLER_ACCESS_KEY|" $RC_INIT_DIR/$HOLER_NAME
-    sed -i "s|@HOLER_SERVER_HOST@|$HOLER_SERVER_HOST|" $RC_INIT_DIR/$HOLER_NAME
 
     chmod +x $RC_INIT_DIR/$HOLER_NAME
     chmod +x $HOLER_HOME/$HOLER_NAME*

Binary/Go/scripts/startup.vbs renamed to Binary/Go/scripts/holer.vbs

@@ -23,14 +23,17 @@ Dim HOLER_ACCESS_KEY
 Dim HOLER_SERVER_HOST
 Dim HOLER_VBS_FILE
 Dim HOLER_BOOT_DIR
+Dim HOLER_CONTENTS
 
 Set HOLER_FSO = CreateObject("Scripting.FileSystemObject")
 Set HOLER_WSH = CreateObject("WScript.Shell")
 Set HOLER_ENV = HOLER_WSH.Environment("USER")
 
-HOLER_VBS_FILE = "startup.vbs"
+HOLER_VBS_FILE = "holer.vbs"
+HOLER_VBS_STARTUP = "startup.vbs"
 HOLER_BOOT_DIR = "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\StartUp\"
 HOLER_HOME = HOLER_FSO.GetFolder(".").Path & "\"
+HOLER_CONF = HOLER_HOME & "holer.conf"
 
 '---------------------------------------------------
 ' Input parameters
@@ -44,10 +47,14 @@ HOLER_ENV("HOLER_HOME") = HOLER_HOME
 HOLER_ENV("HOLER_ACCESS_KEY") = HOLER_ACCESS_KEY
 HOLER_ENV("HOLER_SERVER_HOST") = HOLER_SERVER_HOST
 
+HOLER_CONTENTS = "HOLER_ACCESS_KEY=" & HOLER_ACCESS_KEY & vbCrLf & "HOLER_SERVER_HOST=" & HOLER_SERVER_HOST
+WriteFile HOLER_CONF, HOLER_CONTENTS
+
 '---------------------------------------------------
 ' Set startup
 '---------------------------------------------------
 HOLER_FSO.CopyFile HOLER_VBS_FILE, HOLER_BOOT_DIR
+HOLER_FSO.CopyFile HOLER_BOOT_DIR & HOLER_VBS_FILE, HOLER_VBS_STARTUP
 
 MsgBox("Done")
 WScript.Quit
@@ -68,3 +75,17 @@ Function InputParam()
         WScript.Quit
     End If
 End Function
+
+'---------------------------------------------------
+' Write contents to file
+'---------------------------------------------------
+Function WriteFile(file, contents)
+    Dim OutStream, FSO
+
+    on error resume Next
+    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set OutStream = FSO.OpenTextFile(file, 2, True)
+
+    OutStream.Write contents
+    OutStream.close
+End Function

Binary/Go/scripts/setup.sh

@@ -19,19 +19,11 @@
 # -----------------------------------------------------------------------------
 cd `dirname $0`
 
-HOLER_CONF=`pwd`/holer.conf
-if [ -f $HOLER_CONF ]; then
-    . $HOLER_CONF
-fi
-
-if [ "$HOLER_HOME" == "" ]; then
-    HOLER_HOME=`pwd`
-fi
-
 HOLER_OK=0
 HOLER_ERR=1
 HOLER_PID=""
 
+HOLER_HOME=`pwd`
 HOLER_LOG_DIR=$HOLER_HOME/logs
 HOLER_LOG=$HOLER_LOG_DIR/holer-client.log
 HOLER_BIN=$HOLER_HOME/holer-linux-amd64

Binary/Go/scripts/setup.vbs

@@ -23,10 +23,8 @@ set errorlevel=
 set HOLER_OK=0
 set HOLER_ERR=1
 
-if "!HOLER_HOME!" equ "" (
-    set HOLER_HOME=%~dp0
-)
-
+set HOLER_HOME=%~dp0
+set HOLER_CONF=!HOLER_HOME!\holer.conf
 set HOLER_BIN=holer-windows-amd64.exe
 set HOLER_LOG_DIR=!HOLER_HOME!\logs
 set HOLER_LOG=!HOLER_LOG_DIR!\holer-client.log
@@ -37,7 +35,12 @@ if not exist "!HOLER_LOG_DIR!" (
     mkdir "!HOLER_LOG_DIR!"
 )
 
-@REM  Asking for the HOLER_ACCESS_KEY
+@REM Set HOLER ENV
+if exist "!HOLER_CONF!" (
+    for /f "usebackq eol=# delims== tokens=1,*" %%i in ("!HOLER_CONF!") do set %%i=%%j
+)
+
+@REM Asking for the HOLER_ACCESS_KEY
 if "!HOLER_ACCESS_KEY!" equ "" (
     @echo !HOLER_LINE!
     set /p HOLER_ACCESS_KEY="Enter holer access key: "
@@ -47,9 +50,10 @@ if "!HOLER_ACCESS_KEY!" equ "" (
         pause
         exit /b !HOLER_ERR!
     )
+    @echo HOLER_ACCESS_KEY=!HOLER_ACCESS_KEY!> !HOLER_CONF!
 )
 
-@REM  Asking for the HOLER_SERVER_HOST
+@REM Asking for the HOLER_SERVER_HOST
 if "!HOLER_SERVER_HOST!" equ "" (
     @echo !HOLER_LINE!
     set /p HOLER_SERVER_HOST="Enter holer server host: "
@@ -59,13 +63,14 @@ if "!HOLER_SERVER_HOST!" equ "" (
         pause
         exit /b !HOLER_ERR!
     )
+    @echo HOLER_SERVER_HOST=!HOLER_SERVER_HOST!>> !HOLER_CONF!
 )
 
 @echo !HOLER_LINE!
 @echo Starting holer client...
 
-start /b !HOLER_BIN! -k !HOLER_ACCESS_KEY! -s !HOLER_SERVER_HOST! >> !HOLER_LOG!
-timeout /T 4 /NOBREAK
+start /b /min !HOLER_BIN! -k !HOLER_ACCESS_KEY! -s !HOLER_SERVER_HOST! >> !HOLER_LOG!
+timeout /T 3 /NOBREAK
 
 @echo !HOLER_LINE!
 tasklist | findstr !HOLER_BIN!
@@ -81,7 +86,7 @@ if !errorlevel! equ 0 (
     @echo Holer client is stopped.
     @echo Please check the log file for details [ !HOLER_LOG! ]
     @echo !HOLER_LINE!
-    pause
 )
 
+pause
 goto:eof

Binary/Go/scripts/shutdown.sh

@@ -19,24 +19,15 @@
 # -----------------------------------------------------------------------------
 cd `dirname $0`
 
-HOLER_CONF=`pwd`/holer.conf
-if [ -f $HOLER_CONF ]; then
-    . $HOLER_CONF
-fi
-
-if [ "$HOLER_HOME" == "" ]; then    
-    HOLER_HOME=`pwd`
-    echo "HOLER_HOME=$HOLER_HOME" > $HOLER_CONF
-fi
-
 HOLER_OK=0
 HOLER_ERR=1
 HOLER_PID=""
 
+HOLER_HOME=`pwd`
 HOLER_LOG_DIR=$HOLER_HOME/logs
 HOLER_LOG=$HOLER_LOG_DIR/holer-client.log
 HOLER_BIN=$HOLER_HOME/holer-linux-amd64
-
+HOLER_CONF=$HOLER_HOME/holer.conf
 
 function pid() 
 {
@@ -55,6 +46,10 @@ function status()
 
 function input() 
 {
+    if [ -f $HOLER_CONF ]; then
+        . $HOLER_CONF
+    fi
+
     # Asking for the holer access key
     if [ "$HOLER_ACCESS_KEY" == "" ]; then
         echo "Enter holer access key:"
@@ -63,7 +58,7 @@ function input()
             echo "Please enter holer access key."
             exit $HOLER_ERR
         fi
-        echo "HOLER_ACCESS_KEY=$HOLER_ACCESS_KEY" >> $HOLER_CONF
+        echo "HOLER_ACCESS_KEY=$HOLER_ACCESS_KEY" > $HOLER_CONF
     fi
 
     # Asking for the holer server host