diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a98c89823..275ba9c0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,9 @@ on: - main pull_request: +env: + SIGN_PIPE_VER: main + jobs: release: runs-on: ubuntu-latest @@ -48,10 +51,18 @@ jobs: if: github.event_name != 'pull_request' uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_USER }} + username: netbirdio password: ${{ secrets.DOCKER_TOKEN }} + - name: Install dependencies run: sudo apt update && sudo apt install -y -q libgtk-3-dev libappindicator3-dev libayatana-appindicator3-dev libgl1-mesa-dev xorg-dev gcc-mingw-w64-x86-64 + + - name: Install rsrc + run: go install github.com/akavel/rsrc@v0.10.2 + + - name: Generate windows rsrc + run: rsrc -arch amd64 -ico client/ui/netbird.ico -manifest client/ui/manifest.xml -o client/ui/resources_windows_amd64.syso + - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 @@ -63,18 +74,17 @@ jobs: HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }} UPLOAD_DEBIAN_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} UPLOAD_YUM_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} - - name: Trigger Windows binaries sign pipeline uses: benc-uk/workflow-dispatch@v1 if: startsWith(github.ref, 'refs/tags/') with: workflow: Sign windows bin and installer - repo: wiretrustee/windows-sign-pipeline - ref: v0.0.2 + repo: netbirdio/sign-pipelines + ref: ${{ env.SIGN_PIPE_VER }} token: ${{ secrets.SIGN_GITHUB_TOKEN }} inputs: '{ "tag": "${{ github.ref }}" }' - - + - name: upload non tags for debug purposes uses: actions/upload-artifact@v2 with: @@ -108,19 +118,29 @@ jobs: run: go mod tidy - name: Run GoReleaser + id: goreleaser uses: goreleaser/goreleaser-action@v2 with: version: v1.6.3 args: release --config .goreleaser_ui_darwin.yaml --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }} - UPLOAD_DEBIAN_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} - UPLOAD_YUM_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} - - + + - + name: Trigger Darwin App binaries sign pipeline + uses: benc-uk/workflow-dispatch@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + workflow: Sign darwin ui app + repo: netbirdio/sign-pipelines + ref: ${{ env.SIGN_PIPE_VER }} + token: ${{ secrets.SIGN_GITHUB_TOKEN }} + inputs: '{ "tag": "${{ github.ref }}" }' + + - name: upload non tags for debug purposes uses: actions/upload-artifact@v2 with: name: build-ui-darwin path: dist/ - retention-days: 3 + retention-days: 3 diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 345810e35..3b6ae2456 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,8 +1,8 @@ -project_name: wiretrustee +project_name: netbird builds: - - id: wiretrustee + - id: netbird dir: client - binary: wiretrustee + binary: netbird env: [CGO_ENABLED=0] goos: - linux @@ -55,9 +55,9 @@ builds: - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser mod_timestamp: '{{ .CommitTimestamp }}' - - id: wiretrustee-ui + - id: netbird-ui dir: client/ui - binary: wiretrustee-ui + binary: netbird-ui env: - CGO_ENABLED=1 goos: @@ -68,9 +68,9 @@ builds: - -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser mod_timestamp: '{{ .CommitTimestamp }}' - - id: wiretrustee-ui-windows + - id: netbird-ui-windows dir: client/ui - binary: wiretrustee-ui-windows + binary: netbird-ui env: - CGO_ENABLED=1 - CC=x86_64-w64-mingw32-gcc @@ -80,23 +80,50 @@ builds: - amd64 ldflags: - -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser + - -H windowsgui mod_timestamp: '{{ .CommitTimestamp }}' archives: - builds: - - wiretrustee + - netbird + - id: linux-arch + name_template: "{{ .ProjectName }}-ui-linux_{{ .Version }}_{{ .Os }}_{{ .Arch }}" + builds: + - netbird-ui + - id: windows-arch + name_template: "{{ .ProjectName }}-ui-windows_{{ .Version }}_{{ .Os }}_{{ .Arch }}" + builds: + - netbird-ui-windows nfpms: - - maintainer: Wiretrustee - description: Wiretrustee client UI. - homepage: https://wiretrustee.com/ - id: wiretrustee-ui-deb - package_name: wiretrustee-ui + - maintainer: Netbird + description: Netbird client UI. + homepage: https://netbird.io/ + id: netbird-ui-deb + package_name: netbird-ui builds: - - wiretrustee-ui + - netbird-ui formats: - deb + contents: + - src: client/ui/netbird.desktop + dst: /usr/share/applications/netbird.desktop + - src: client/ui/disconnected.png + dst: /usr/share/pixmaps/netbird.png + dependencies: + - libayatana-appindicator3-1 + - libgtk-3-dev + - libappindicator3-dev + + - maintainer: Netbird + description: Netbird client UI. + homepage: https://netbird.io/ + id: netbird-ui-rpm + package_name: netbird-ui + builds: + - netbird-ui + formats: - rpm contents: - src: client/ui/netbird.desktop @@ -108,13 +135,13 @@ nfpms: - libgtk-3-dev - libappindicator3-dev - - maintainer: Wiretrustee - description: Wiretrustee client. - homepage: https://wiretrustee.com/ - id: wiretrustee-deb + - maintainer: Netbird + description: Netbird client. + homepage: https://netbird.io/ + id: netbird-deb bindir: /usr/bin builds: - - wiretrustee + - netbird formats: - deb @@ -122,13 +149,13 @@ nfpms: postinstall: "release_files/post_install.sh" preremove: "release_files/pre_remove.sh" - - maintainer: Wiretrustee - description: Wiretrustee client. - homepage: https://wiretrustee.com/ - id: wiretrustee-rpm + - maintainer: Netbird + description: Netbird client. + homepage: https://netbird.io/ + id: netbird-rpm bindir: /usr/bin builds: - - wiretrustee + - netbird formats: - rpm @@ -137,9 +164,9 @@ nfpms: preremove: "release_files/pre_remove.sh" dockers: - image_templates: - - wiretrustee/wiretrustee:{{ .Version }}-amd64 + - netbirdio/netbird:{{ .Version }}-amd64 ids: - - wiretrustee + - netbird goarch: amd64 use: buildx dockerfile: client/Dockerfile @@ -150,11 +177,11 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=maintainer=wiretrustee@wiretrustee.com" + - "--label=maintainer=dev@netbird.io" - image_templates: - - wiretrustee/wiretrustee:{{ .Version }}-arm64v8 + - netbirdio/netbird:{{ .Version }}-arm64v8 ids: - - wiretrustee + - netbird goarch: arm64 use: buildx dockerfile: client/Dockerfile @@ -165,11 +192,11 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=maintainer=wiretrustee@wiretrustee.com" + - "--label=maintainer=dev@netbird.io" - image_templates: - - wiretrustee/wiretrustee:{{ .Version }}-arm + - netbirdio/netbird:{{ .Version }}-arm ids: - - wiretrustee + - netbird goarch: arm goarm: 6 use: buildx @@ -181,7 +208,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=maintainer=wiretrustee@wiretrustee.com" + - "--label=maintainer=dev@netbird.io" - image_templates: - netbirdio/signal:{{ .Version }}-amd64 ids: @@ -198,7 +225,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/signal:{{ .Version }}-arm64v8 + - netbirdio/signal:{{ .Version }}-arm64v8 ids: - netbird-signal goarch: arm64 @@ -213,7 +240,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/signal:{{ .Version }}-arm + - netbirdio/signal:{{ .Version }}-arm ids: - netbird-signal goarch: arm @@ -229,7 +256,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/management:{{ .Version }}-amd64 + - netbirdio/management:{{ .Version }}-amd64 ids: - netbird-mgmt goarch: amd64 @@ -244,7 +271,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/management:{{ .Version }}-arm64v8 + - netbirdio/management:{{ .Version }}-arm64v8 ids: - netbird-mgmt goarch: arm64 @@ -259,7 +286,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/management:{{ .Version }}-arm + - netbirdio/management:{{ .Version }}-arm ids: - netbird-mgmt goarch: arm @@ -275,7 +302,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/management:{{ .Version }}-debug-amd64 + - netbirdio/management:{{ .Version }}-debug-amd64 ids: - netbird-mgmt goarch: amd64 @@ -290,7 +317,7 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/management:{{ .Version }}-debug-arm64v8 + - netbirdio/management:{{ .Version }}-debug-arm64v8 ids: - netbird-mgmt goarch: arm64 @@ -306,7 +333,7 @@ dockers: - "--label=maintainer=dev@netbird.io" - image_templates: - - netbird/management:{{ .Version }}-debug-arm + - netbirdio/management:{{ .Version }}-debug-arm ids: - netbird-mgmt goarch: arm @@ -322,60 +349,62 @@ dockers: - "--label=org.opencontainers.image.version={{.Version}}" - "--label=maintainer=dev@netbird.io" docker_manifests: - - name_template: wiretrustee/wiretrustee:{{ .Version }} + - name_template: netbirdio/netbird:{{ .Version }} image_templates: - - wiretrustee/wiretrustee:{{ .Version }}-arm64v8 - - wiretrustee/wiretrustee:{{ .Version }}-arm - - wiretrustee/wiretrustee:{{ .Version }}-amd64 + - netbirdio/netbird:{{ .Version }}-arm64v8 + - netbirdio/netbird:{{ .Version }}-arm + - netbirdio/netbird:{{ .Version }}-amd64 - - name_template: wiretrustee/wiretrustee:latest + - name_template: netbirdio/netbird:latest image_templates: - - wiretrustee/wiretrustee:{{ .Version }}-arm64v8 - - wiretrustee/wiretrustee:{{ .Version }}-arm - - wiretrustee/wiretrustee:{{ .Version }}-amd64 + - netbirdio/netbird:{{ .Version }}-arm64v8 + - netbirdio/netbird:{{ .Version }}-arm + - netbirdio/netbird:{{ .Version }}-amd64 - - name_template: netbird/signal:{{ .Version }} + - name_template: netbirdio/signal:{{ .Version }} image_templates: - - netbird/signal:{{ .Version }}-arm64v8 - - netbird/signal:{{ .Version }}-arm - - netbird/signal:{{ .Version }}-amd64 + - netbirdio/signal:{{ .Version }}-arm64v8 + - netbirdio/signal:{{ .Version }}-arm + - netbirdio/signal:{{ .Version }}-amd64 - - name_template: netbird/signal:latest + - name_template: netbirdio/signal:latest image_templates: - - netbird/signal:{{ .Version }}-arm64v8 - - netbird/signal:{{ .Version }}-arm - - netbird/signal:{{ .Version }}-amd64 + - netbirdio/signal:{{ .Version }}-arm64v8 + - netbirdio/signal:{{ .Version }}-arm + - netbirdio/signal:{{ .Version }}-amd64 - - name_template: netbird/management:{{ .Version }} + - name_template: netbirdio/management:{{ .Version }} image_templates: - - netbird/management:{{ .Version }}-arm64v8 - - netbird/management:{{ .Version }}-arm - - netbird/management:{{ .Version }}-amd64 + - netbirdio/management:{{ .Version }}-arm64v8 + - netbirdio/management:{{ .Version }}-arm + - netbirdio/management:{{ .Version }}-amd64 - - name_template: netbird/management:latest + - name_template: netbirdio/management:latest image_templates: - - netbird/management:{{ .Version }}-arm64v8 - - netbird/management:{{ .Version }}-arm - - netbird/management:{{ .Version }}-amd64 + - netbirdio/management:{{ .Version }}-arm64v8 + - netbirdio/management:{{ .Version }}-arm + - netbirdio/management:{{ .Version }}-amd64 - - name_template: netbird/management:debug-latest + - name_template: netbirdio/management:debug-latest image_templates: - - netbird/management:{{ .Version }}-debug-arm64v8 - - netbird/management:{{ .Version }}-debug-arm - - netbird/management:{{ .Version }}-debug-amd64 + - netbirdio/management:{{ .Version }}-debug-arm64v8 + - netbirdio/management:{{ .Version }}-debug-arm + - netbirdio/management:{{ .Version }}-debug-amd64 brews: - + ids: + - default tap: - owner: wiretrustee - name: homebrew-client + owner: netbirdio + name: homebrew-tap token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}" commit_author: - name: Wiretrustee - email: wiretrustee@wiretrustee.com - description: Wiretrustee project. + name: Netbird + email: dev@netbird.io + description: Netbird project. download_strategy: CurlDownloadStrategy - homepage: https://wiretrustee.com/ + homepage: https://netbird.io/ license: "BSD3" test: | system "#{bin}/{{ .ProjectName }} -h" @@ -384,6 +413,7 @@ uploads: - name: debian ids: - deb + - netbird-ui-deb mode: archive target: https://pkgs.wiretrustee.com/debian/pool/{{ .ArtifactName }};deb.distribution=stable;deb.component=main;deb.architecture={{ if .Arm }}armhf{{ else }}{{ .Arch }}{{ end }};deb.package= username: dev@wiretrustee.com @@ -391,6 +421,7 @@ uploads: - name: yum ids: - rpm + - netbird-ui-rpm mode: archive target: https://pkgs.wiretrustee.com/yum/{{ .Arch }}{{ if .Arm }}{{ .Arm }}{{ end }} username: dev@wiretrustee.com diff --git a/.goreleaser_ui_darwin.yaml b/.goreleaser_ui_darwin.yaml index 04d6fb44e..9cfb679d2 100644 --- a/.goreleaser_ui_darwin.yaml +++ b/.goreleaser_ui_darwin.yaml @@ -1,8 +1,8 @@ -project_name: wiretrustee-ui +project_name: netbird-ui builds: - - id: wiretrustee-ui-darwin + - id: netbird-ui-darwin dir: client/ui - binary: wiretrustee-ui + binary: netbird-ui env: [CGO_ENABLED=1] goos: @@ -21,18 +21,7 @@ builds: archives: - builds: - - wiretrustee-ui-darwin + - netbird-ui-darwin -brews: - - - tap: - owner: wiretrustee - name: homebrew-client - token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}" - commit_author: - name: Wiretrustee - email: wiretrustee@wiretrustee.com - description: Wiretrustee project. - download_strategy: CurlDownloadStrategy - homepage: https://wiretrustee.com/ - license: "BSD3" +changelog: + skip: true \ No newline at end of file diff --git a/client/Dockerfile b/client/Dockerfile index 45e36df09..58b0b5529 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -1,4 +1,4 @@ FROM gcr.io/distroless/base:debug ENV WT_LOG_FILE=console -ENTRYPOINT [ "/go/bin/wiretrustee","up"] -COPY wiretrustee /go/bin/wiretrustee \ No newline at end of file +ENTRYPOINT [ "/go/bin/netbird","up"] +COPY netbird /go/bin/netbird \ No newline at end of file diff --git a/client/installer.nsis b/client/installer.nsis index b92cb9bc1..c5f173b6b 100644 --- a/client/installer.nsis +++ b/client/installer.nsis @@ -1,12 +1,12 @@ -!define APP_NAME "Wiretrustee" -!define COMP_NAME "Wiretrustee" -!define WEB_SITE "wiretrustee.com" +!define APP_NAME "Netbird" +!define COMP_NAME "Netbird" +!define WEB_SITE "Netbird.io" !define VERSION $%APPVER% -!define COPYRIGHT "Wiretrustee Authors, 2021" +!define COPYRIGHT "Netbird Authors, 2021" !define DESCRIPTION "A WireGuard®-based mesh network that connects your devices into a single private network" -!define INSTALLER_NAME "wiretrustee-installer.exe" -!define MAIN_APP_EXE "Wiretrustee" -!define ICON "ui\\wiretrustee.ico" +!define INSTALLER_NAME "netbird-installer.exe" +!define MAIN_APP_EXE "Netbird" +!define ICON "ui\\netbird.ico" !define BANNER "ui\\banner.bmp" !define LICENSE_DATA "..\\LICENSE" @@ -16,8 +16,8 @@ !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" -!define UI_APP_NAME "Wiretrustee UI" -!define UI_APP_EXE "Wiretrustee-ui" +!define UI_APP_NAME "Netbird UI" +!define UI_APP_EXE "Netbird-ui" !define UI_REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${UI_APP_EXE}" !define UI_UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UI_APP_NAME}" @@ -83,8 +83,7 @@ Section -MainProgram ${INSTALL_TYPE} SetOverwrite ifnewer SetOutPath "$INSTDIR" - File /r "..\\dist\\wiretrustee_windows_amd64\\" - File /r "..\\dist\\wiretrustee-ui_windows_amd64\\" + File /r "..\\dist\\netbird_windows_amd64\\" SectionEnd @@ -92,18 +91,18 @@ SectionEnd Section -Icons_Reg SetOutPath "$INSTDIR" -WriteUninstaller "$INSTDIR\wiretrustee_uninstall.exe" +WriteUninstaller "$INSTDIR\netbird_uninstall.exe" WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}" -WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\wiretrustee_uninstall.exe" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\netbird_uninstall.exe" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" WriteRegStr ${REG_ROOT} "${UI_REG_APP_PATH}" "" "$INSTDIR\${UI_APP_EXE}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayName" "${UI_APP_NAME}" -WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "UninstallString" "$INSTDIR\wiretrustee_uninstall.exe" +WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "UninstallString" "$INSTDIR\netbird_uninstall.exe" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${UI_APP_EXE}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" @@ -111,6 +110,9 @@ WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" EnVar::SetHKLM EnVar::AddValueEx "path" "$INSTDIR" +CreateShortCut "${SMPROGRAMS}\${UI_APP_NAME}.lnk" "$INSTDIR\${UI_APP_EXE}" +CreateShortCut "${DESKTOP}\${UI_APP_NAME}.lnk" "$INSTDIR\${UI_APP_EXE}" + Exec '"$INSTDIR\${MAIN_APP_EXE}" service install' Exec '"$INSTDIR\${MAIN_APP_EXE}" service start' # sleep a bit for visibility diff --git a/client/manifest.xml b/client/manifest.xml index 392a6f7ff..77c0eade8 100644 --- a/client/manifest.xml +++ b/client/manifest.xml @@ -3,10 +3,10 @@ - Wiretrustee application + Netbird application diff --git a/client/resources.rc b/client/resources.rc index 8459d85c0..cd8a28284 100644 --- a/client/resources.rc +++ b/client/resources.rc @@ -5,5 +5,5 @@ #define STRINGIZE(x) #x #define EXPAND(x) STRINGIZE(x) CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST manifest.xml -7 ICON ui/wiretrustee.ico +7 ICON ui/netbird.ico wireguard.dll RCDATA wireguard.dll diff --git a/client/ui/Info.plist b/client/ui/Info.plist new file mode 100644 index 000000000..8441110b9 --- /dev/null +++ b/client/ui/Info.plist @@ -0,0 +1,12 @@ + + + + + CFBundleExecutable + netbird-ui + CFBundleIconFile + Netbird + LSUIElement + 1 + + diff --git a/client/ui/Netbird.icns b/client/ui/Netbird.icns new file mode 100644 index 000000000..20af72825 Binary files /dev/null and b/client/ui/Netbird.icns differ diff --git a/client/ui/manifest.xml b/client/ui/manifest.xml new file mode 100644 index 000000000..c71a407e5 --- /dev/null +++ b/client/ui/manifest.xml @@ -0,0 +1,17 @@ + + + + Netbird UI application + + + + + + + + \ No newline at end of file diff --git a/client/ui/netbird-ui.rb.tmpl b/client/ui/netbird-ui.rb.tmpl new file mode 100644 index 000000000..b74037990 --- /dev/null +++ b/client/ui/netbird-ui.rb.tmpl @@ -0,0 +1,21 @@ +{{ $projectName := env.Getenv "PROJECT" }}{{ $amdFilePath := env.Getenv "AMD" }}{{ $armFilePath := env.Getenv "ARM" }} +{{ $amdURL := env.Getenv "AMD_URL" }}{{ $armURL := env.Getenv "ARM_URL" }} +{{ $amdFile := filepath.Base $amdFilePath }}{{ $armFile := filepath.Base $armFilePath }}{{ $amdFileBytes := file.Read $amdFilePath }} +{{ $armFileBytes := file.Read $armFilePath }}# Netbird's UI Client Cask Formula +cask "{{ $projectName }}" do + version "{{ env.Getenv "VERSION" }}" + + if Hardware::CPU.intel? + url "{{ $amdURL }}" + sha256 "{{ crypto.SHA256 $amdFileBytes }}" + app "netbird_ui_darwin_amd64", target: "Netbird UI.app" + else + url "{{ $armURL }}" + sha256 "{{ crypto.SHA256 $armFileBytes }}" + app "netbird_ui_darwin_arm64", target: "Netbird UI.app" + end + + name "Netbird UI" + desc "Netbird UI Client" + homepage "https://www.netbird.io/" +end \ No newline at end of file diff --git a/client/ui/netbird.desktop b/client/ui/netbird.desktop index c4ac46765..a783056be 100644 --- a/client/ui/netbird.desktop +++ b/client/ui/netbird.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Netbird Agent -Exec=/usr/bin/wiretrustee-ui +Exec=/usr/bin/netbird-ui Icon=netbird Type=Application Terminal=false diff --git a/client/ui/netbird.ico b/client/ui/netbird.ico new file mode 100644 index 000000000..2bab8a503 Binary files /dev/null and b/client/ui/netbird.ico differ diff --git a/client/ui/wiretrustee.ico b/client/ui/wiretrustee.ico deleted file mode 100644 index 7ec2fb4f6..000000000 Binary files a/client/ui/wiretrustee.ico and /dev/null differ