From 4bcaab266220a7bfe59a9fd8bbc1d49f41d83340 Mon Sep 17 00:00:00 2001 From: Mike the Tike Date: Mon, 10 Jan 2022 11:57:03 +0200 Subject: [PATCH] ci: add tor script to binaries bundle --- .github/workflows/base_node_binaries.yml | 51 +++++-------------- README.md | 2 +- .../runtime/linux-diag-repo.sh | 0 .../runtime/setup_tor_service.sh | 0 .../{ubuntu => linux}/runtime/start_all.sh | 0 .../runtime/start_tari_base_node.sh | 0 .../{ubuntu => linux}/runtime/start_tor.sh | 4 +- .../tari_base_node/linux/setup_tor_service | 1 + applications/tari_base_node/linux/start_all | 1 + .../tari_base_node/linux/start_tari_base_node | 1 + applications/tari_base_node/linux/start_tor | 1 + .../{ubuntu => linux}/supervisord.md | 0 .../tari_base_node/osx/runtime/start_tor.sh | 2 +- applications/tari_base_node/src/main.rs | 2 +- .../tari_base_node/ubuntu/setup_tor_service | 1 - applications/tari_base_node/ubuntu/start_all | 1 - .../ubuntu/start_tari_base_node | 1 - applications/tari_base_node/ubuntu/start_tor | 1 - .../windows/runtime/start_tor.bat | 2 +- .../runtime/start_tari_console_wallet.sh | 0 .../linux/start_tari_console_wallet | 1 + .../ubuntu/start_tari_console_wallet | 1 - base_layer/p2p/src/initialization.rs | 2 +- buildtools/create_ubuntu_install_zip.sh | 32 ++++++------ common/src/exit_codes.rs | 2 +- 25 files changed, 43 insertions(+), 66 deletions(-) rename applications/tari_base_node/{ubuntu => linux}/runtime/linux-diag-repo.sh (100%) mode change 100755 => 100644 rename applications/tari_base_node/{ubuntu => linux}/runtime/setup_tor_service.sh (100%) mode change 100755 => 100644 rename applications/tari_base_node/{ubuntu => linux}/runtime/start_all.sh (100%) mode change 100755 => 100644 rename applications/tari_base_node/{ubuntu => linux}/runtime/start_tari_base_node.sh (100%) mode change 100755 => 100644 rename applications/tari_base_node/{ubuntu => linux}/runtime/start_tor.sh (86%) mode change 100755 => 100644 create mode 100644 applications/tari_base_node/linux/setup_tor_service create mode 100644 applications/tari_base_node/linux/start_all create mode 100644 applications/tari_base_node/linux/start_tari_base_node create mode 100644 applications/tari_base_node/linux/start_tor rename applications/tari_base_node/{ubuntu => linux}/supervisord.md (100%) delete mode 120000 applications/tari_base_node/ubuntu/setup_tor_service delete mode 120000 applications/tari_base_node/ubuntu/start_all delete mode 120000 applications/tari_base_node/ubuntu/start_tari_base_node delete mode 120000 applications/tari_base_node/ubuntu/start_tor rename applications/tari_console_wallet/{ubuntu => linux}/runtime/start_tari_console_wallet.sh (100%) mode change 100755 => 100644 create mode 100644 applications/tari_console_wallet/linux/start_tari_console_wallet delete mode 120000 applications/tari_console_wallet/ubuntu/start_tari_console_wallet diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml index 080c3e8011..91e7fcef5f 100644 --- a/.github/workflows/base_node_binaries.yml +++ b/.github/workflows/base_node_binaries.yml @@ -17,7 +17,6 @@ on: env: TBN_FILENAME: "tari_base_node" -# PROTOC: protoc jobs: builds: @@ -95,7 +94,6 @@ jobs: libappindicator3-dev \ patchelf \ librsvg2-dev - # sudo apt-get -y upgrade - name: Install macOS dependencies if: startsWith(runner.os,'macOS') run: brew install cmake zip coreutils @@ -112,13 +110,14 @@ jobs: echo "SHARUN=shasum --algorithm 256" >> $GITHUB_ENV echo "CC=gcc" >> $GITHUB_ENV echo "TBN_EXT=" >> $GITHUB_ENV - echo "S3DESTDIR=linux" >> $GITHUB_ENV + echo "SHELL_EXT=.sh" >> $GITHUB_ENV + echo "PLATFORM_SPECIFIC_DIR=linux" >> $GITHUB_ENV echo "TBN_DIST=/dist" >> $GITHUB_ENV - name: Set environment variables - macOS if: startsWith(runner.os,'macOS') run: | - echo "S3DESTDIR=osx" >> $GITHUB_ENV + echo "PLATFORM_SPECIFIC_DIR=osx" >> $GITHUB_ENV - name: Set environment variables - Windows if: startsWith(runner.os,'Windows') @@ -126,14 +125,15 @@ jobs: run: | echo "SHARUN=pwsh C:\ProgramData\chocolatey\lib\psutils\tools\psutils-master\shasum.ps1 --algorithm 256" >> $GITHUB_ENV echo "TBN_EXT=.exe" >> $GITHUB_ENV + echo "SHELL_EXT=.bat" >> $GITHUB_ENV echo "TBN_DIST=\dist" >> $GITHUB_ENV - echo "S3DESTDIR=windows" >> $GITHUB_ENV + echo "PLATFORM_SPECIFIC_DIR=windows" >> $GITHUB_ENV echo "SQLITE3_LIB_DIR=C:\vcpkg\installed\x64-windows\lib" >> $GITHUB_ENV echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH - - name: Caching + - name: Cache cargo files and outputs uses: actions/cache@v2 with: path: | @@ -142,50 +142,27 @@ jobs: target key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - - name: Compile NPM + - name: Compile launchpad GUI run: | cd applications/launchpad/gui-vue npm install npm run build - - name: Compile react (collectibles) + - name: Compile collectibles GUI run: | cd applications/tari_collectibles/web-app npm install npm run build - - name: Build binaries + - name: Build rust binaries env: RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}" ROARING_ARCH: "${{ matrix.target_cpu }}" run: | echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}" - #cd applications/tari_base_node - #cargo build --release --bin tari_base_node --features ${{ matrix.features}} cargo build --release -# - name: Build tauri apps -# env: -# RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}" -# run: | -# echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}" -# cd applications/tari_collectibles -# npm install -# cd web-app -# npm install -# cd .. -# npm run tauri build - - # - name: Prepare Archives - # - name: Prepare Archives - # shell: bash - # run: | - # ls -la "$GITHUB_WORKSPACE" - # mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}/archives" - # export distDir="$GITHUB_WORKSPACE${TBN_DIST}/archives" - # "$GITHUB_WORKSPACE/scripts/build_dists_tarball.sh" noBuild - - - name: Prepare binaries + - name: Copy binaries to folder for zipping shell: bash run: | mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}" @@ -195,11 +172,9 @@ jobs: echo "Sha: ${VSHA_SHORT}" echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "VSHA_SHORT=${VSHA_SHORT}" >> $GITHUB_ENV - #BINFILE="${TBN_FILENAME}-${VERSION}-${VSHA_SHORT}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}${TBN_EXT}" BINFILE="${TBN_FILENAME}-${VERSION}-${VSHA_SHORT}-${{ matrix.os }}-${{ matrix.target_cpu }}${TBN_EXT}" echo "BINFILE=${BINFILE}" >> $GITHUB_ENV echo "Copying files for ${BINFILE} to $(pwd)" - #cp -v "$GITHUB_WORKSPACE/target/release/${TBN_FILENAME}${TBN_EXT}" "./${BINFILE}" ls -la "$GITHUB_WORKSPACE/target/release/" cp -v "$GITHUB_WORKSPACE/target/release/tari_base_node${TBN_EXT}" . cp -v "$GITHUB_WORKSPACE/target/release/tari_console_wallet${TBN_EXT}" . @@ -207,6 +182,8 @@ jobs: cp -v "$GITHUB_WORKSPACE/target/release/tari_mining_node${TBN_EXT}" . cp -v "$GITHUB_WORKSPACE/target/release/tari_validator_node${TBN_EXT}" . cp -v "$GITHUB_WORKSPACE/target/release/tari_collectibles${TBN_EXT}" . + cp -v "$GITHUB_WORKSPACE/target/release/tari_launchpad${TBN_EXT}" . + cp -v "$GITHUB_WORKSPACE/applications/tari_base_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" . - name: Build the macos pkg if: startsWith(runner.os,'macOS') @@ -310,7 +287,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} SOURCE: "${{ github.workspace }}${{ env.TBN_DIST }}" - DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.S3DESTDIR }}/" + DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.PLATFORM_SPECIFIC_DIR }}/" S3CMD: "cp" S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"' # S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"' @@ -346,7 +323,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} SOURCE: "${{ github.workspace }}${{ env.TBN_DIST }}" - DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.S3DESTDIR }}/" + DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.PLATFORM_SPECIFIC_DIR }}/" S3CMD: "cp" S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"' # S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"' diff --git a/README.md b/README.md index 613b76e6c6..9fcda7013d 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,7 @@ The executables will either be inside your `~/tari/target/release` (on Linux) or directory, depending on the build choice above, and must be run from the command line. If the former build method was used, you can run it from that directory, or you more likely want to copy it somewhere more convenient. Make sure to start Tor service `~/tari/applications/tari_base_node/osx/start_tor` (on Mac), -`~/tari/applications/tari_base_node/ubuntu/start_tor` (on Linux) or +`~/tari/applications/tari_base_node/linux/start_tor` (on Linux) or `%USERPROFILE%\Code\tari\applications\tari_base_node\windows\start_tor.lnk` (on Windows). To run from any directory of your choice, where the executable is visible in the path (first time use): diff --git a/applications/tari_base_node/ubuntu/runtime/linux-diag-repo.sh b/applications/tari_base_node/linux/runtime/linux-diag-repo.sh old mode 100755 new mode 100644 similarity index 100% rename from applications/tari_base_node/ubuntu/runtime/linux-diag-repo.sh rename to applications/tari_base_node/linux/runtime/linux-diag-repo.sh diff --git a/applications/tari_base_node/ubuntu/runtime/setup_tor_service.sh b/applications/tari_base_node/linux/runtime/setup_tor_service.sh old mode 100755 new mode 100644 similarity index 100% rename from applications/tari_base_node/ubuntu/runtime/setup_tor_service.sh rename to applications/tari_base_node/linux/runtime/setup_tor_service.sh diff --git a/applications/tari_base_node/ubuntu/runtime/start_all.sh b/applications/tari_base_node/linux/runtime/start_all.sh old mode 100755 new mode 100644 similarity index 100% rename from applications/tari_base_node/ubuntu/runtime/start_all.sh rename to applications/tari_base_node/linux/runtime/start_all.sh diff --git a/applications/tari_base_node/ubuntu/runtime/start_tari_base_node.sh b/applications/tari_base_node/linux/runtime/start_tari_base_node.sh old mode 100755 new mode 100644 similarity index 100% rename from applications/tari_base_node/ubuntu/runtime/start_tari_base_node.sh rename to applications/tari_base_node/linux/runtime/start_tari_base_node.sh diff --git a/applications/tari_base_node/ubuntu/runtime/start_tor.sh b/applications/tari_base_node/linux/runtime/start_tor.sh old mode 100755 new mode 100644 similarity index 86% rename from applications/tari_base_node/ubuntu/runtime/start_tor.sh rename to applications/tari_base_node/linux/runtime/start_tor.sh index 81be8bbe1f..b63cf53a95 --- a/applications/tari_base_node/ubuntu/runtime/start_tor.sh +++ b/applications/tari_base_node/linux/runtime/start_tor.sh @@ -14,9 +14,9 @@ fi #gnome-terminal --working-directory="$PWD" -- tor --allow-missing-torrc --ignore-missing-torrc \ # --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 \ -# --log "notice stdout" --clientuseipv6 1 "${no_output}" +# --log "warn stdout" --clientuseipv6 1 "${no_output}" gnome-terminal --working-directory="$PWD" -- tor --allow-missing-torrc --ignore-missing-torrc \ --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 \ - --log "notice stdout" --clientuseipv6 1 + --log "warn stdout" --clientuseipv6 1 diff --git a/applications/tari_base_node/linux/setup_tor_service b/applications/tari_base_node/linux/setup_tor_service new file mode 100644 index 0000000000..b4c2ad40dc --- /dev/null +++ b/applications/tari_base_node/linux/setup_tor_service @@ -0,0 +1 @@ +./runtime/setup_tor_service.sh \ No newline at end of file diff --git a/applications/tari_base_node/linux/start_all b/applications/tari_base_node/linux/start_all new file mode 100644 index 0000000000..99f1754e18 --- /dev/null +++ b/applications/tari_base_node/linux/start_all @@ -0,0 +1 @@ +./runtime/start_all.sh \ No newline at end of file diff --git a/applications/tari_base_node/linux/start_tari_base_node b/applications/tari_base_node/linux/start_tari_base_node new file mode 100644 index 0000000000..f192df73da --- /dev/null +++ b/applications/tari_base_node/linux/start_tari_base_node @@ -0,0 +1 @@ +./runtime/start_tari_base_node.sh \ No newline at end of file diff --git a/applications/tari_base_node/linux/start_tor b/applications/tari_base_node/linux/start_tor new file mode 100644 index 0000000000..1997cc7ff2 --- /dev/null +++ b/applications/tari_base_node/linux/start_tor @@ -0,0 +1 @@ +./runtime/start_tor.sh \ No newline at end of file diff --git a/applications/tari_base_node/ubuntu/supervisord.md b/applications/tari_base_node/linux/supervisord.md similarity index 100% rename from applications/tari_base_node/ubuntu/supervisord.md rename to applications/tari_base_node/linux/supervisord.md diff --git a/applications/tari_base_node/osx/runtime/start_tor.sh b/applications/tari_base_node/osx/runtime/start_tor.sh index ef9cf45734..ec6e393929 100755 --- a/applications/tari_base_node/osx/runtime/start_tor.sh +++ b/applications/tari_base_node/osx/runtime/start_tor.sh @@ -5,4 +5,4 @@ TOR=$(which tor) $TOR --allow-missing-torrc --ignore-missing-torrc \ --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 \ - --log "notice stdout" --clientuseipv6 1 + --log "warn stdout" --clientuseipv6 1 diff --git a/applications/tari_base_node/src/main.rs b/applications/tari_base_node/src/main.rs index 3b1b70b541..3150bdc6a6 100644 --- a/applications/tari_base_node/src/main.rs +++ b/applications/tari_base_node/src/main.rs @@ -49,7 +49,7 @@ /// ``` /// tor --allow-missing-torrc --ignore-missing-torrc \ /// --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 \ -/// --log "notice stdout" --clientuseipv6 1 +/// --log "warn stdout" --clientuseipv6 1 /// ``` /// /// For the first run diff --git a/applications/tari_base_node/ubuntu/setup_tor_service b/applications/tari_base_node/ubuntu/setup_tor_service deleted file mode 120000 index b4c2ad40dc..0000000000 --- a/applications/tari_base_node/ubuntu/setup_tor_service +++ /dev/null @@ -1 +0,0 @@ -./runtime/setup_tor_service.sh \ No newline at end of file diff --git a/applications/tari_base_node/ubuntu/start_all b/applications/tari_base_node/ubuntu/start_all deleted file mode 120000 index 99f1754e18..0000000000 --- a/applications/tari_base_node/ubuntu/start_all +++ /dev/null @@ -1 +0,0 @@ -./runtime/start_all.sh \ No newline at end of file diff --git a/applications/tari_base_node/ubuntu/start_tari_base_node b/applications/tari_base_node/ubuntu/start_tari_base_node deleted file mode 120000 index f192df73da..0000000000 --- a/applications/tari_base_node/ubuntu/start_tari_base_node +++ /dev/null @@ -1 +0,0 @@ -./runtime/start_tari_base_node.sh \ No newline at end of file diff --git a/applications/tari_base_node/ubuntu/start_tor b/applications/tari_base_node/ubuntu/start_tor deleted file mode 120000 index 1997cc7ff2..0000000000 --- a/applications/tari_base_node/ubuntu/start_tor +++ /dev/null @@ -1 +0,0 @@ -./runtime/start_tor.sh \ No newline at end of file diff --git a/applications/tari_base_node/windows/runtime/start_tor.bat b/applications/tari_base_node/windows/runtime/start_tor.bat index 234bace449..424d28ccc2 100644 --- a/applications/tari_base_node/windows/runtime/start_tor.bat +++ b/applications/tari_base_node/windows/runtime/start_tor.bat @@ -31,7 +31,7 @@ if not defined TOR_RUNNING ( pause ) ) - start tor --allow-missing-torrc --ignore-missing-torrc --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 --clientuseipv6 1 --log "notice stdout" + start tor --allow-missing-torrc --ignore-missing-torrc --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 --clientuseipv6 1 --log "warn stdout" echo Attempting to start Tor service on ports 9050 and 9051 ping -n 15 localhost>nul ) else ( diff --git a/applications/tari_console_wallet/ubuntu/runtime/start_tari_console_wallet.sh b/applications/tari_console_wallet/linux/runtime/start_tari_console_wallet.sh old mode 100755 new mode 100644 similarity index 100% rename from applications/tari_console_wallet/ubuntu/runtime/start_tari_console_wallet.sh rename to applications/tari_console_wallet/linux/runtime/start_tari_console_wallet.sh diff --git a/applications/tari_console_wallet/linux/start_tari_console_wallet b/applications/tari_console_wallet/linux/start_tari_console_wallet new file mode 100644 index 0000000000..b49ab10859 --- /dev/null +++ b/applications/tari_console_wallet/linux/start_tari_console_wallet @@ -0,0 +1 @@ +./runtime/start_tari_console_wallet.sh \ No newline at end of file diff --git a/applications/tari_console_wallet/ubuntu/start_tari_console_wallet b/applications/tari_console_wallet/ubuntu/start_tari_console_wallet deleted file mode 120000 index b49ab10859..0000000000 --- a/applications/tari_console_wallet/ubuntu/start_tari_console_wallet +++ /dev/null @@ -1 +0,0 @@ -./runtime/start_tari_console_wallet.sh \ No newline at end of file diff --git a/base_layer/p2p/src/initialization.rs b/base_layer/p2p/src/initialization.rs index ee04b6ab4b..29e12178a4 100644 --- a/base_layer/p2p/src/initialization.rs +++ b/base_layer/p2p/src/initialization.rs @@ -105,7 +105,7 @@ impl CommsInitializationError { => r#"Unable to connect to the Tor control port. Please check that you have the Tor proxy running and that access to the Tor control port is turned on. If you are unsure of what to do, use the following command to start the Tor proxy: - tor --allow-missing-torrc --ignore-missing-torrc --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 --log "notice stdout" --clientuseipv6 1"# + tor --allow-missing-torrc --ignore-missing-torrc --clientonly 1 --socksport 9050 --controlport 127.0.0.1:9051 --log "warn stdout" --clientuseipv6 1"# .to_string(), err => format!("Failed to initialize comms: {:?}", err), } diff --git a/buildtools/create_ubuntu_install_zip.sh b/buildtools/create_ubuntu_install_zip.sh index dfe93a0961..a3ca3672f6 100755 --- a/buildtools/create_ubuntu_install_zip.sh +++ b/buildtools/create_ubuntu_install_zip.sh @@ -42,33 +42,33 @@ else fi # One click miner -cp -f -P "${app_dir}/tari_base_node/ubuntu/start_all" "${tarball_folder}/start_all" -cp -f "${app_dir}/tari_base_node/ubuntu/runtime/start_all.sh" "${tarball_folder}/runtime/start_all.sh" +cp -f -P "${app_dir}/tari_base_node/linux/start_all" "${tarball_folder}/start_all" +cp -f "${app_dir}/tari_base_node/linux/runtime/start_all.sh" "${tarball_folder}/runtime/start_all.sh" # Base Node -cp -f -P "${app_dir}/tari_base_node/ubuntu/setup_tor_service" "${tarball_folder}/setup_tor_service" -cp -f -P "${app_dir}/tari_base_node/ubuntu/start_tari_base_node" "${tarball_folder}/start_tari_base_node" -cp -f -P "${app_dir}/tari_base_node/ubuntu/start_tor" "${tarball_folder}/start_tor" -cp -f "${app_dir}/tari_base_node/ubuntu/runtime/setup_tor_service.sh" "${tarball_folder}/runtime/setup_tor_service.sh" -cp -f "${app_dir}/tari_base_node/ubuntu/runtime/start_tari_base_node.sh" "${tarball_folder}/runtime/start_tari_base_node.sh" -cp -f "${app_dir}/tari_base_node/ubuntu/runtime/start_tor.sh" "${tarball_folder}/runtime/start_tor.sh" +cp -f -P "${app_dir}/tari_base_node/linux/setup_tor_service" "${tarball_folder}/setup_tor_service" +cp -f -P "${app_dir}/tari_base_node/linux/start_tari_base_node" "${tarball_folder}/start_tari_base_node" +cp -f -P "${app_dir}/tari_base_node/linux/start_tor" "${tarball_folder}/start_tor" +cp -f "${app_dir}/tari_base_node/linux/runtime/setup_tor_service.sh" "${tarball_folder}/runtime/setup_tor_service.sh" +cp -f "${app_dir}/tari_base_node/linux/runtime/start_tari_base_node.sh" "${tarball_folder}/runtime/start_tari_base_node.sh" +cp -f "${app_dir}/tari_base_node/linux/runtime/start_tor.sh" "${tarball_folder}/runtime/start_tor.sh" cp -f "${project_dir}/target/release/tari_base_node" "${tarball_folder}/runtime/tari_base_node" # Console Wallet -cp -f -P "${app_dir}/tari_console_wallet/ubuntu/start_tari_console_wallet" "${tarball_folder}/start_tari_console_wallet" -cp -f "${app_dir}/tari_console_wallet/ubuntu/runtime/start_tari_console_wallet.sh" "${tarball_folder}/runtime/start_tari_console_wallet.sh" +cp -f -P "${app_dir}/tari_console_wallet/linux/start_tari_console_wallet" "${tarball_folder}/start_tari_console_wallet" +cp -f "${app_dir}/tari_console_wallet/linux/runtime/start_tari_console_wallet.sh" "${tarball_folder}/runtime/start_tari_console_wallet.sh" cp -f "${project_dir}/target/release/tari_console_wallet" "${tarball_folder}/runtime/tari_console_wallet" # Mining Node -cp -f -P "${app_dir}/tari_mining_node/ubuntu/start_tari_mining_node" "${tarball_folder}/start_tari_mining_node" -cp -f "${app_dir}/tari_mining_node/ubuntu/runtime/start_tari_mining_nodet.sh" "${tarball_folder}/runtime/start_tari_mining_node.sh" +cp -f -P "${app_dir}/tari_mining_node/linux/start_tari_mining_node" "${tarball_folder}/start_tari_mining_node" +cp -f "${app_dir}/tari_mining_node/linux/runtime/start_tari_mining_nodet.sh" "${tarball_folder}/runtime/start_tari_mining_node.sh" cp -f "${project_dir}/target/release/tari_mining_node" "${tarball_folder}/runtime/tari_mining_node" # Merge Mining Proxy -cp -f -P "${app_dir}/tari_merge_mining_proxy/ubuntu/start_tari_merge_mining_proxy" "${tarball_folder}/start_tari_merge_mining_proxy" -cp -f -P "${app_dir}/tari_merge_mining_proxy/ubuntu/start_xmrig" "${tarball_folder}/start_xmrig" -cp -f "${app_dir}/tari_merge_mining_proxy/ubuntu/runtime/start_tari_merge_mining_proxy.sh" "${tarball_folder}/runtime/start_tari_merge_mining_proxy.sh" -cp -f "${app_dir}/tari_merge_mining_proxy/ubuntu/runtime/start_xmrig.sh" "${tarball_folder}/runtime/start_xmrig.sh" +cp -f -P "${app_dir}/tari_merge_mining_proxy/linux/start_tari_merge_mining_proxy" "${tarball_folder}/start_tari_merge_mining_proxy" +cp -f -P "${app_dir}/tari_merge_mining_proxy/linux/start_xmrig" "${tarball_folder}/start_xmrig" +cp -f "${app_dir}/tari_merge_mining_proxy/linux/runtime/start_tari_merge_mining_proxy.sh" "${tarball_folder}/runtime/start_tari_merge_mining_proxy.sh" +cp -f "${app_dir}/tari_merge_mining_proxy/linux/runtime/start_xmrig.sh" "${tarball_folder}/runtime/start_xmrig.sh" cp -f "${project_dir}/target/release/tari_merge_mining_proxy" "${tarball_folder}/runtime/tari_merge_mining_proxy" # 3rd party install diff --git a/common/src/exit_codes.rs b/common/src/exit_codes.rs index 74be3eb6ab..da5a33401f 100644 --- a/common/src/exit_codes.rs +++ b/common/src/exit_codes.rs @@ -70,7 +70,7 @@ impl ExitCodes { eprintln!("If you are unsure of what to do, use the following command to start the Tor proxy:"); eprintln!( "tor --allow-missing-torrc --ignore-missing-torrc --clientonly 1 --socksport 9050 --controlport \ - 127.0.0.1:9051 --log \"notice stdout\" --clientuseipv6 1", + 127.0.0.1:9051 --log \"warn stdout\" --clientuseipv6 1", ); },