Merge branch 'master' of https://github.com/radix42/SevenSeas

radix42 · May 21, 2019 · 2829af1 · 2829af1
2 parents d2442c4 + ad5a6d5
commit 2829af1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh
@@ -36,7 +36,7 @@ if [ -z $QT_PATH ]; then
 fi
 
 if [ -z $ZCASH_DIR ]; then
-    echo "ZCASH_DIR is not set. Please set it to the base directory of a compiled zcashd";
+    echo "ZCASH_DIR is not set. Please set it to the base directory of a compiled komodod";
     exit 1;
 fi
 
@@ -45,8 +45,8 @@ if [ -z $APP_VERSION ]; then
     exit 1;
 fi
 
-if [ ! -f $ZCASH_DIR/src/zcashd ]; then
-    echo "Could not find compiled zcashd in $ZCASH_DIR/src/.";
+if [ ! -f $ZCASH_DIR/src/komodod ]; then
+    echo "Could not find compiled komodod in $ZCASH_DIR/src/.";
     exit 1;
 fi
 
@@ -80,8 +80,8 @@ echo -n "Deploying.............."
 mkdir artifacts >/dev/null 2>&1
 rm -f artifcats/zecwallet.dmg >/dev/null 2>&1
 rm -f artifacts/rw* >/dev/null 2>&1
-cp $ZCASH_DIR/src/zcashd zecwallet.app/Contents/MacOS/
-cp $ZCASH_DIR/src/zcash-cli zecwallet.app/Contents/MacOS/
+cp $ZCASH_DIR/src/komodod zecwallet.app/Contents/MacOS/
+cp $ZCASH_DIR/src/komodo-cli zecwallet.app/Contents/MacOS/
 $QT_PATH/bin/macdeployqt zecwallet.app 
 echo "[OK]"
 

diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh
@@ -12,32 +12,32 @@ if [ -z $ZCASH_DIR ]; then
     exit 1;
 fi
 
-if [ ! -f $ZCASH_DIR/artifacts/zcashd ]; then
-    echo "Couldn't find zcashd in $ZCASH_DIR/artifacts/. Please build zcashd."
+if [ ! -f $ZCASH_DIR/artifacts/komodod ]; then
+    echo "Couldn't find komodod in $ZCASH_DIR/artifacts/. Please build komodod."
     exit 1;
 fi
 
-if [ ! -f $ZCASH_DIR/artifacts/zcash-cli ]; then
-    echo "Couldn't find zcash-cli in $ZCASH_DIR/artifacts/. Please build zcashd."
+if [ ! -f $ZCASH_DIR/artifacts/komodo-cli ]; then
+    echo "Couldn't find komodo-cli in $ZCASH_DIR/artifacts/. Please build komodod."
     exit 1;
 fi
 
-# Ensure that zcashd is the right build
-echo -n "zcashd version........."
-if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd && ! readelf -s $ZCASH_DIR/artifacts/zcashd | grep -q "GLIBC_2\.25"; then 
+# Ensure that komodod is the right build
+echo -n "komodod version........."
+if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/komodod && ! readelf -s $ZCASH_DIR/artifacts/komodod | grep -q "GLIBC_2\.25"; then 
     echo "[OK]"
 else
     echo "[ERROR]"
-    echo "zcashd doesn't seem to be a zqwMagicBean build or zcashd is built with libc 2.25"
+    echo "komodod doesn't seem to be a zqwMagicBean build or komodod is built with libc 2.25"
     exit 1
 fi
 
-echo -n "zcashd.exe version....."
-if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd.exe; then 
+echo -n "komodod.exe version....."
+if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/komodod.exe; then 
     echo "[OK]"
 else
     echo "[ERROR]"
-    echo "zcashd doesn't seem to be a zqwMagicBean build"
+    echo "komodod doesn't seem to be a zqwMagicBean build"
     exit 1
 fi
 
@@ -86,8 +86,8 @@ mkdir bin/zecwallet-v$APP_VERSION > /dev/null
 strip zecwallet
 
 cp zecwallet                  bin/zecwallet-v$APP_VERSION > /dev/null
-cp $ZCASH_DIR/artifacts/zcashd    bin/zecwallet-v$APP_VERSION > /dev/null
-cp $ZCASH_DIR/artifacts/zcash-cli bin/zecwallet-v$APP_VERSION > /dev/null
+cp $ZCASH_DIR/artifacts/komodod    bin/zecwallet-v$APP_VERSION > /dev/null
+cp $ZCASH_DIR/artifacts/komodo-cli bin/zecwallet-v$APP_VERSION > /dev/null
 cp README.md                      bin/zecwallet-v$APP_VERSION > /dev/null
 cp LICENSE                        bin/zecwallet-v$APP_VERSION > /dev/null
 
@@ -122,7 +122,7 @@ mkdir -p $debdir/usr/local/bin
 cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control
 
 cp zecwallet                   $debdir/usr/local/bin/
-cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd
+cp $ZCASH_DIR/artifacts/komodod $debdir/usr/local/bin/zqw-komodod
 
 mkdir -p $debdir/usr/share/pixmaps/
 cp res/zecwallet.xpm           $debdir/usr/share/pixmaps/
@@ -145,14 +145,14 @@ if [ -z $MXE_PATH ]; then
     exit 0; 
 fi
 
-if [ ! -f $ZCASH_DIR/artifacts/zcashd.exe ]; then
-    echo "Couldn't find zcashd.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe"
+if [ ! -f $ZCASH_DIR/artifacts/komodod.exe ]; then
+    echo "Couldn't find komodod.exe in $ZCASH_DIR/artifacts/. Please build komodod.exe"
     exit 1;
 fi
 
 
-if [ ! -f $ZCASH_DIR/artifacts/zcash-cli.exe ]; then
-    echo "Couldn't find zcash-cli.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe"
+if [ ! -f $ZCASH_DIR/artifacts/komodo-cli.exe ]; then
+    echo "Couldn't find komodo-cli.exe in $ZCASH_DIR/artifacts/. Please build komodod.exe"
     exit 1;
 fi
 
@@ -176,8 +176,8 @@ echo "[OK]"
 echo -n "Packaging.............."
 mkdir release/zecwallet-v$APP_VERSION  
 cp release/zecwallet.exe          release/zecwallet-v$APP_VERSION 
-cp $ZCASH_DIR/artifacts/zcashd.exe    release/zecwallet-v$APP_VERSION > /dev/null
-cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zecwallet-v$APP_VERSION > /dev/null
+cp $ZCASH_DIR/artifacts/komodod.exe    release/zecwallet-v$APP_VERSION > /dev/null
+cp $ZCASH_DIR/artifacts/komodo-cli.exe release/zecwallet-v$APP_VERSION > /dev/null
 cp README.md                          release/zecwallet-v$APP_VERSION 
 cp LICENSE                            release/zecwallet-v$APP_VERSION 
 cd release && zip -r Windows-binaries-zecwallet-v$APP_VERSION.zip zecwallet-v$APP_VERSION/ > /dev/null

diff --git a/src/scripts/mkwininstaller.ps1 b/src/scripts/mkwininstaller.ps1
@@ -10,8 +10,8 @@ New-Item release/wininstaller -itemtype directory                    | Out-Null
 Copy-Item release/$target/zecwallet.exe     release/wininstaller/
 Copy-Item release/$target/LICENSE           release/wininstaller/
 Copy-Item release/$target/README.md         release/wininstaller/
-Copy-Item release/$target/zcashd.exe        release/wininstaller/
-Copy-Item release/$target/zcash-cli.exe     release/wininstaller/
+Copy-Item release/$target/komodod.exe        release/wininstaller/
+Copy-Item release/$target/komodo-cli.exe     release/wininstaller/
 
 Get-Content src/scripts/zec-qt-wallet.wxs | ForEach-Object { $_ -replace "RELEASE_VERSION", "$version" } | Out-File -Encoding utf8 release/wininstaller/zec-qt-wallet.wxs
 

diff --git a/src/scripts/zec-qt-wallet.wxs b/src/scripts/zec-qt-wallet.wxs
@@ -61,13 +61,13 @@
                     </Shortcut>
                 </File>
                 <File Source="LICENSE" />
-                <File Source="zcashd.exe" />
-                <File Source="zcash-cli.exe" />
+                <File Source="komodod.exe" />
+                <File Source="komodo-cli.exe" />
                 <File Source="README.md" />
 
-                <RegistryKey Root="HKCR" Key="zcash">
+                <RegistryKey Root="HKCR" Key="komodo">
                     <RegistryValue Type="string" Name="URL Protocol" Value=""/>
-                    <RegistryValue Type="string" Value="URL:zcash URI protocol"/>
+                    <RegistryValue Type="string" Value="URL:komodo URI protocol"/>
                     <RegistryKey Key="DefaultIcon">
                     <RegistryValue Type="string" Value="zecwallet.exe" />
                     </RegistryKey>