Merge pull request #49 from VerusCoin/Asher-Dev

Adding upgrade batch file for verus-cli for Windows and updating the …

kmd/linux/verus-cli/update-verus-agama.sh

@@ -9,19 +9,19 @@ fi
 PASSED=$1
 
 if [ -d "${PASSED}" ] ; then
-    if [ -f "${PASSED}/komodod" ] ; then
-        cp komodod ${PASSED}
-        cp komodo-cli ${PASSED}
+    if [ -f "${PASSED}/resources/app/assets/bin/linux64/komodod" ] ; then
+        cp komodod ${PASSED}/resources/app/assets/bin/linux64/
+        cp komodo-cli ${PASSED}/resources/app/assets/bin/linux64/
         exit 0
     else
-        echo "No komodod found in ${PASSED}"
+        echo "No komodod found in ${PASSED}/resources/app/assets/bin/linux64/"
         echo "Copying komodod and komodo-cli anyway"
-        cp komodod ${PASSED}
-        cp komodo-cli ${PASSED}
+        cp komodod ${PASSED}/resources/app/assets/bin/linux64/
+        cp komodo-cli ${PASSED}/resources/app/assets/bin/linux64/
         exit 0
     fi
 else
-    echo "Pass the Agama-darwin-x64 directory on the command line."
+    echo "Pass the Agama-linux-x64 directory on the command line."
     echo "${PASSED} is not a valid directory.";
     exit 1
 fi

kmd/mac/verus-cli/update-verus-agama.sh

@@ -9,15 +9,15 @@ fi
 PASSED=$1
 
 if [ -d "${PASSED}" ] ; then
-    if [ -f "${PASSED}/komodod" ] ; then
-        cp komodod ${PASSED}
-        cp komodo-cli ${PASSED}
+    if [ -f "${PASSED}/resources/app/assets/bin/osx/komodod" ] ; then
+        cp komodod ${PASSED}/resources/app/assets/bin/osx
+        cp komodo-cli ${PASSED}/resources/app/assets/bin/osx
         exit 0
     else
         echo "No komodod found in ${PASSED}"
         echo "Copying komodod and komodo-cli anyway"
-        cp komodod ${PASSED}
-        cp komodo-cli ${PASSED}
+        cp komodod ${PASSED}/resources/app/assets/bin/osx
+        cp komodo-cli ${PASSED}/resources/app/assets/bin/osx
         exit 0
     fi
 else

kmd/windows/verus-cli/README.txt

@@ -4,9 +4,11 @@ komodod.exe - VerusCoin's enhanced Komodo daemon
 komodo-cli.exe - iVerusCoin's Komodo command line utility
 verus.bat - wrapper for komodo-cli that applies the command to the VRSC coin
 verusd.bat - wrapper for komodod that sets the VerusCoin parameters to defaults properly
+update-verus-agama.bat - script to update an existing VerusCoin enhanced Agama wallet install with this version of komodod. To update run the script and pass the path to the wallet on the command line: update-verus-agama.bat ~/Downloads/Agama-win32-x64
 
-The first time on a new system you will need to run ./fetchparams.sh before using komodod or verusd.
-Many virus scanniong products interfere with the VerusCoin tool's ability to open ports and will need to be configfured to allow what the scanner says is unsafe behavior. Extreme cases can result in the virus scanner deleting Agama.exe or moving it to "protect" the system. You will needs to disable those features and re-extract the verus-cli-windows.zip file if that happens.
+The first time on a new system you will need to run ./fetch-params.bat before using komodod.exe or verusd.
+Many anti-virus products interfere with the VerusCoin tool's ability to open ports and will need to be configured to allow what the scanner says is unsafe behavior.
+Extreme cases can result in the virus scanner deleting Agama.exe or moving it to "protect" the system. You will to add the executables to a whitelist and re-extract the verus-cli-windows.zip file if that happens.
 Run verusd.bat to launch komodod, and use verus.bat to run commands such as:
 verus.bat stop
 Which signals komodod.exe (if it is running) to stop running.

kmd/windows/verus-cli/update-verus-agama.bat

@@ -0,0 +1,32 @@
+@echo off
+set AGAMA_DIR=%1
+if defined AGAMA_DIR (
+	goto :CHECK_DIR
+) else (
+	call :GET_AGAMA_DIR
+	goto :CHECK_DIR
+)
+
+:GET_AGAMA_DIR
+set /p AGAMA_DIR="Please enter the path to the Agama directory i.e ~\Users\{USER}\Downloads\Agama-win32-x64 :"
+goto :EOF
+
+:CHECK_DIR
+IF NOT EXIST %AGAMA_DIR% (
+	ECHO "Directory does not exist. No changes applied. Exiting.
+	goto :EOF
+) else (
+	goto :UPGRADE
+)
+goto :EOF
+
+:UPGRADE
+pushd %~dp0
+set SCRIPT_DIR=%CD%
+popd
+cd %SCRIPT_DIR%
+set TARGET=%AGAMA_DIR%\resources\app\assets\bin\win64\
+xcopy komodo*.exe %TARGET% /b/v/y || echo  UPGRADE FAILED && goto :EOF
+echo upgrade successful
+goto :EOF
+