Verified Commit 80048d62 authored by BTCxZelko's avatar BTCxZelko
Browse files

Bridge Fix and env modification

parent 15a5897d
......@@ -24,7 +24,7 @@ echo "Downloading and extracting latest RoninDojo release..."
echo "***"
echo -e "${NC}"
cd "$HOME" || exit
git clone -b master "$SAMOURAI_REPO" dojo
git clone -b "${SAMOURAI_BRANCH:-master}" "$SAMOURAI_REPO" dojo
echo -e "${RED}"
echo "***"
......
......@@ -42,7 +42,7 @@ fi
# enable BITCOIND_RPC_EXTERNAL
cd "${WORK_DIR}" || exit
git clone -b master "$SAMOURAI_REPO" # temporary
git clone -b "${SAMOURAI_BRANCH:-master}" "$SAMOURAI_REPO" # temporary
cp -ua samourai-dojo/* "$HOME"/dojo/
# copy only when the SOURCE file is newer than the
......
......@@ -32,8 +32,13 @@ NC=$(tput sgr0)
#
# Install Defaults
#
RONIN_DOJO_BRANCH="" # defaults to master
DOJO_PATH="$HOME/dojo/docker/my-dojo"
DOJO_BRANCH="" # defaults to master
SAMOURAI_REPO='https://code.samourai.io/ronindojo/samourai-dojo.git'
SAMOURAI_BRANCH="" # defaults to master
# Workaround when on x86 systems and autologin is enabled for the user account
if [ "$(getent group 1000 | cut -d ':' -f1)" = "autologin" ]; then
......
......@@ -5,13 +5,13 @@ RED=$(tput setaf 1)
NC=$(tput sgr0)
# No Color
# Update script
. "$HOME"/RoninDojo/Scripts/update.sh
#
# Main function runs at beginning of script execution
#
_main() {
# Source update script
. "$HOME"/RoninDojo/Scripts/update.sh
_update_01 # Check for bridge-utils version update
# Create symbolic link for main ronin script
......@@ -189,7 +189,7 @@ EOF
#!/bin/bash
sudo rm -rf "$HOME/RoninDojo"
cd "$HOME"
git clone https://code.samourai.io/ronindojo/RoninDojo
git clone -b "${RONIN_DOJO_BRANCH:-master}" https://code.samourai.io/ronindojo/RoninDojo
${RED}
***
Upgrade Complete!
......
......@@ -4,7 +4,7 @@
. "$HOME"/RoninDojo/Scripts/functions.sh
_update_01() {
if ! _check_pkgver bridge-utils 1.7.1; then
if ! _check_pkgver bridge-utils 1.7-1; then
cat <<EOF
${RED}
***
......@@ -14,7 +14,7 @@ RoninDojo will upgade your package to latest version available
${NC}
EOF
_sleep 5 --msg "Starting bridge-utils upgrade in"
sudo pacman -Q -U --noconfirm http://mirror.archlinuxarm.org/aarch64/extra/bridge-utils-1.7-1-aarch64.pkg.tar.xz
sudo pacman -U --noconfirm http://mirror.archlinuxarm.org/aarch64/extra/bridge-utils-1.7-1-aarch64.pkg.tar.xz &>/dev/null
# If existing dojo found, then reboot system to apply changes
if [ -d "${HOME}/dojo" ]; then
......@@ -30,4 +30,4 @@ EOF
sudo systemctl reboot
fi
fi
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment