diff --git a/.dockerignore b/.dockerignore index 11174d44..95bcfdd1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -19,13 +19,13 @@ docs/_build/ node_modules/ # Development scripts -dev_scripts/ +dev-scripts/ dev-docs/ # Tauri development files src-tauri/target/ -# GUI development files +# GUI development files src-gui/node_modules/ src-gui/dist/ src-gui/.next/ @@ -38,4 +38,4 @@ src-gui/.next/ *.temp # OS files -Thumbs.db \ No newline at end of file +Thumbs.db diff --git a/.github/workflows/build-gui-release-binaries.yml b/.github/workflows/build-gui-release-binaries.yml index b0a4cc48..4f7f3886 100644 --- a/.github/workflows/build-gui-release-binaries.yml +++ b/.github/workflows/build-gui-release-binaries.yml @@ -195,40 +195,11 @@ jobs: echo "aarch64 SHA256: $AARCH64_SHA256" echo "x64 SHA256: $X64_SHA256" - # Generate the Homebrew formula - cat > eigenwallet.rb <<'EOF' -cask "eigenwallet" do - version "$VERSION" - - on_arm do - sha256 "$AARCH64_SHA256" - url "https://github.com/eigenwallet/core/releases/download/#{version}/eigenwallet_#{version}_aarch64.dmg" - end - - on_intel do - sha256 "$X64_SHA256" - url "https://github.com/eigenwallet/core/releases/download/#{version}/eigenwallet_#{version}_x64.dmg" - end - - name "Eigenwallet" - desc "GUI for XMR<>BTC Atomic Swaps" - homepage "https://github.com/eigenwallet/core" - - livecheck do - url :url - strategy :github_latest - end - - auto_updates true - - app "eigenwallet.app" -end -EOF - - # Now substitute the bash variables - sed -i "s/\$VERSION/$VERSION/g" eigenwallet.rb - sed -i "s/\$AARCH64_SHA256/$AARCH64_SHA256/g" eigenwallet.rb - sed -i "s/\$X64_SHA256/$X64_SHA256/g" eigenwallet.rb + # Generate the Homebrew formula from template + cp dev-scripts/homebrew/eigenwallet.rb.template eigenwallet.rb + sed -i "s/VERSION_PLACEHOLDER/$VERSION/g" eigenwallet.rb + sed -i "s/AARCH64_SHA256_PLACEHOLDER/$AARCH64_SHA256/g" eigenwallet.rb + sed -i "s/X64_SHA256_PLACEHOLDER/$X64_SHA256/g" eigenwallet.rb cat eigenwallet.rb diff --git a/dev_scripts/brew_dependencies_install.sh b/dev-scripts/brew_dependencies_install.sh similarity index 100% rename from dev_scripts/brew_dependencies_install.sh rename to dev-scripts/brew_dependencies_install.sh diff --git a/dev_scripts/bump-version.sh b/dev-scripts/bump-version.sh similarity index 100% rename from dev_scripts/bump-version.sh rename to dev-scripts/bump-version.sh diff --git a/dev_scripts/code2prompt_as_file_mac_os.sh b/dev-scripts/code2prompt_as_file_mac_os.sh similarity index 100% rename from dev_scripts/code2prompt_as_file_mac_os.sh rename to dev-scripts/code2prompt_as_file_mac_os.sh diff --git a/dev_scripts/code2prompt_to_clipboard.sh b/dev-scripts/code2prompt_to_clipboard.sh similarity index 100% rename from dev_scripts/code2prompt_to_clipboard.sh rename to dev-scripts/code2prompt_to_clipboard.sh diff --git a/dev-scripts/homebrew/eigenwallet.rb.template b/dev-scripts/homebrew/eigenwallet.rb.template new file mode 100644 index 00000000..a2b98c1b --- /dev/null +++ b/dev-scripts/homebrew/eigenwallet.rb.template @@ -0,0 +1,26 @@ +cask "eigenwallet" do + version "VERSION_PLACEHOLDER" + + on_arm do + sha256 "AARCH64_SHA256_PLACEHOLDER" + url "https://github.com/eigenwallet/core/releases/download/#{version}/eigenwallet_#{version}_aarch64.dmg" + end + + on_intel do + sha256 "X64_SHA256_PLACEHOLDER" + url "https://github.com/eigenwallet/core/releases/download/#{version}/eigenwallet_#{version}_x64.dmg" + end + + name "Eigenwallet" + desc "GUI for XMR<>BTC Atomic Swaps" + homepage "https://github.com/eigenwallet/core" + + livecheck do + url :url + strategy :github_latest + end + + auto_updates true + + app "eigenwallet.app" +end diff --git a/dev_scripts/publish_flatpak.sh b/dev-scripts/publish_flatpak.sh similarity index 100% rename from dev_scripts/publish_flatpak.sh rename to dev-scripts/publish_flatpak.sh diff --git a/dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh b/dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh similarity index 99% rename from dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh rename to dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh index aa9d99be..29a10b7c 100755 --- a/dev_scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh +++ b/dev-scripts/ubuntu_build_x86_86-w64-mingw32-gcc.sh @@ -39,7 +39,7 @@ esac set -euo pipefail -# Get the current project root (this file is in /dev_scripts/ and gets called via just (just file is at /justfile)) +# Get the current project root (this file is in /dev-scripts/ and gets called via just (just file is at /justfile)) SRC_TAURI_DIR="$(pwd)/../src-tauri" # Check if src-tauri directory exists diff --git a/justfile b/justfile index 68e5d8b6..1fca23cf 100644 --- a/justfile +++ b/justfile @@ -123,7 +123,7 @@ docker-prune-network: # Install dependencies required for building monero-sys prepare_mac_os_brew_dependencies: - cd dev_scripts && chmod +x ./brew_dependencies_install.sh && ./brew_dependencies_install.sh + cd dev-scripts && chmod +x ./brew_dependencies_install.sh && ./brew_dependencies_install.sh # Takes a crate (e.g monero-rpc-pool) and uses code2prompt to copy to clipboard # E.g code2prompt . --exclude "*.lock" --exclude ".sqlx/*" --exclude "target" @@ -131,4 +131,4 @@ code2prompt_single_crate crate: cd {{crate}} && code2prompt . --exclude "*.lock" --exclude ".sqlx/*" --exclude "target" prepare-windows-build: - cd dev_scripts && ./ubuntu_build_x86_86-w64-mingw32-gcc.sh + cd dev-scripts && ./ubuntu_build_x86_86-w64-mingw32-gcc.sh