diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index a0aa2ad..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,105 +0,0 @@ -version: 2 -jobs: - test: - working_directory: /go/src/github.com/broderickhyman/albiondata-client - docker: - - image: circleci/golang:1.16 - steps: - - checkout - - run: go get golang.org/x/tools/cmd/goimports - - run: make validate-fmt - build_windows: - working_directory: /go/src/github.com/broderickhyman/albiondata-client - docker: - - image: broderickhyman/mingw-golang - steps: - - checkout - - run: make build-windows - - store_artifacts: - path: /go/src/github.com/broderickhyman/albiondata-client/update-windows-amd64.exe.gz - destination: update-windows-amd64.exe.gz - - store_artifacts: - path: /go/src/github.com/broderickhyman/albiondata-client/albiondata-client-amd64-installer.exe - destination: albiondata-client-amd64-installer.exe - - persist_to_workspace: - root: /go/src/github.com/broderickhyman/albiondata-client - paths: - - update-windows-amd64.exe.gz - - albiondata-client-amd64-installer.exe - build_linux: - working_directory: /go/src/github.com/broderickhyman/albiondata-client - docker: - - image: circleci/golang:1.16 - steps: - - checkout - - run: make build-linux - - store_artifacts: - path: /go/src/github.com/broderickhyman/albiondata-client/update-linux-amd64.gz - destination: update-linux-amd64.gz - - persist_to_workspace: - root: /go/src/github.com/broderickhyman/albiondata-client - paths: - - update-linux-amd64.gz - build_darwin: - working_directory: /go/src/github.com/broderickhyman/albiondata-client - docker: - - image: broderickhyman/crossbuild-golang - steps: - - checkout - - run: make build-darwin - - store_artifacts: - path: /go/src/github.com/broderickhyman/albiondata-client/update-darwin-amd64.gz - destination: update-darwin-amd64.gz - - store_artifacts: - path: /go/src/github.com/broderickhyman/albiondata-client/albiondata-client-amd64-mac.zip - destination: albiondata-client-amd64-mac.zip - - persist_to_workspace: - root: /go/src/github.com/broderickhyman/albiondata-client - paths: - - update-darwin-amd64.gz - - albiondata-client-amd64-mac.zip - deploy: - working_directory: /tmp/workspace - docker: - - image: circleci/golang:1.17 - steps: - - attach_workspace: - at: /tmp/workspace - - run: go get github.com/tcnksm/ghr - - run: ghr -t $GITHUB_TOKEN -u broderickhyman -r albiondata-client $CIRCLE_TAG /tmp/workspace -workflows: - version: 2 - test_build_release: - jobs: - - test: - filters: - tags: - only: /.*/ - - build_windows: - requires: - - test - filters: - tags: - only: /.*/ - - build_linux: - requires: - - test - filters: - tags: - only: /.*/ - - build_darwin: - requires: - - test - filters: - tags: - only: /.*/ - - deploy: - requires: - - build_windows - - build_linux - - build_darwin - filters: - tags: - only: /^\d+\.\d+\.\d+$/ - branches: - ignore: /.*/ diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 974605f..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,8 +0,0 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: broderickhyman -open_collective: # Replace with a single Open Collective username -ko_fi: broderickhyman -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -custom: # Replace with a single custom sponsorship URL diff --git a/.github/windowsbuild.yaml b/.github/windowsbuild.yaml new file mode 100644 index 0000000..7befcff --- /dev/null +++ b/.github/windowsbuild.yaml @@ -0,0 +1,22 @@ +on: + workflow_dispatch: + +jobs: + build-windows: + name: Build Windows Client + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.16 + + # - uses: shogo82148/actions-upload-release-asset@v1 + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: update-linux-amd64.gz + - name: Create installer + uses: joncloud/makensis-action@v4 + # with: + # arguments: "/V3" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f32e995..64494ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,7 @@ jobs: with: upload_url: ${{ github.event.release.upload_url }} asset_path: update-linux-amd64.gz + build-windows: name: Build Windows Client runs-on: ubuntu-latest @@ -29,23 +30,84 @@ jobs: uses: actions/setup-go@v3 with: go-version: 1.16 - - name: Build + + - name: install nsis + run: sudo apt-get update; sudo apt-get -y install nsis + + - name: Make run: make build-windows + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: albiondata-client.exe + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: update-windows-amd64.exe.gz + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: albiondata-client-amd64-installer.exe + - uses: shogo82148/actions-upload-release-asset@v1 + if: ${{ !env.ACT }} with: upload_url: ${{ github.event.release.upload_url }} asset_path: update-windows-amd64.exe.gz + - uses: shogo82148/actions-upload-release-asset@v1 + if: ${{ !env.ACT }} with: upload_url: ${{ github.event.release.upload_url }} asset_path: albiondata-client-amd64-installer.exe + build-darwin: name: Build MacOS Client - runs-on: ubuntu-latest + runs-on: macos-13 steps: - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.19 + - name: Build - run: ./scripts/build-and-copy-darwin.sh + run: go build -ldflags "-s -w -X main.version=$GITHUB_REF_NAME" albiondata-client.go + + - name: ls + run: ls -la + + - name: gzip + run: gzip -k9 albiondata-client + + - name: mv + run: mv albiondata-client.gz update-darwin-amd64.gz + + - name: package + run: | + TEMP="albiondata-client" + ZIPNAME="albiondata-client-amd64-mac.zip" + rm -rfv ./scripts/$TEMP + rm -rfv ./$ZIPNAME + rm -rfv ./scripts/update-darwin-amd64.zip + mkdir -v ./scripts/$TEMP + cp -v albiondata-client ./scripts/$TEMP/albiondata-client-executable + cd scripts + cp -v run.command ./$TEMP/run.command + # chown -Rv ${USER}:${USER} ./$TEMP + chmod -v 777 ./$TEMP/* + zip -v ../$ZIPNAME -r ./"$TEMP" + + - name: ls + run: ls -la + - uses: shogo82148/actions-upload-release-asset@v1 with: upload_url: ${{ github.event.release.upload_url }} diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 6cfe4c9..9836588 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -14,6 +14,19 @@ jobs: go-version: 1.16 - name: Build run: make build-linux + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: albiondata-client + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: update-linux-amd64.gz + build-windows: name: Build Windows Client runs-on: ubuntu-latest @@ -23,12 +36,68 @@ jobs: uses: actions/setup-go@v3 with: go-version: 1.16 - - name: Build + + - name: install nsis + run: sudo apt-get update; sudo apt-get -y install nsis + + - name: Make run: make build-windows + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: albiondata-client.exe + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: update-windows-amd64.exe.gz + + - uses: actions/upload-artifact@v3 + if: ${{ env.ACT }} + with: + name: files + path: albiondata-client-amd64-installer.exe + build-darwin: name: Build MacOS Client - runs-on: ubuntu-latest + runs-on: macos-13 steps: - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.19 + - name: Build - run: ./scripts/build-and-copy-darwin.sh + run: go build -ldflags "-s -w -X main.version=$GITHUB_REF_NAME" albiondata-client.go + + - name: ls + run: ls -la + + - name: gzip + run: gzip -k9 albiondata-client + + - name: mv + run: mv albiondata-client.gz update-darwin-amd64.gz + + - name: package + run: | + TEMP="albiondata-client" + ZIPNAME="albiondata-client-amd64-mac.zip" + rm -rfv ./scripts/$TEMP + rm -rfv ./$ZIPNAME + rm -rfv ./scripts/update-darwin-amd64.zip + mkdir -v ./scripts/$TEMP + cp -v albiondata-client ./scripts/$TEMP/albiondata-client-executable + cd scripts + cp -v run.command ./$TEMP/run.command + # chown -Rv ${USER}:${USER} ./$TEMP + chmod -v 777 ./$TEMP/* + zip -v ../$ZIPNAME -r ./"$TEMP" + + - name: ls + run: ls -la diff --git a/.github/workflows/windowsbuild.yml b/.github/workflows/windowsbuild.yml new file mode 100644 index 0000000..dfe9ea9 --- /dev/null +++ b/.github/workflows/windowsbuild.yml @@ -0,0 +1,33 @@ +name: Test Build +on: + workflow_dispatch: + inputs: + noop: + description: 'Dry run? true/false' +jobs: + build-windows: + name: Build Windows Client + # runs-on: windows-latest + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.16 + + # - uses: shogo82148/actions-upload-release-asset@v1 + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: update-linux-amd64.gz + # - name: Create installer + # uses: joncloud/makensis-action@v4 + # with: + # # arguments: "script-file" + # script-file: "pkg/nsis/albiondata-client.nsi" + - name: Install nsis + run: sudo apt-get -y install nsis + - name: Make Installer + run: cd pkg/nsis;make nsis + + \ No newline at end of file diff --git a/albiondata-client.go b/albiondata-client.go index 77ceeab..04cce6a 100644 --- a/albiondata-client.go +++ b/albiondata-client.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "github.com/broderickhyman/albiondata-client/client" - "github.com/broderickhyman/albiondata-client/log" - "github.com/broderickhyman/albiondata-client/systray" + "github.com/ao-data/albiondata-client/client" + "github.com/ao-data/albiondata-client/log" + "github.com/ao-data/albiondata-client/systray" - "github.com/broderickhyman/go-githubupdate/updater" + "github.com/ao-data/go-githubupdate/updater" ) var version string @@ -19,6 +19,11 @@ func init() { } func main() { + if client.ConfigGlobal.PrintVersion { + log.Infof("Albion Data Client, version: %s", version) + return + } + startUpdater() go systray.Run() diff --git a/client/albion_state.go b/client/albion_state.go index cdad7b2..7f847ba 100644 --- a/client/albion_state.go +++ b/client/albion_state.go @@ -1,9 +1,9 @@ package client import ( - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" - "github.com/broderickhyman/albiondata-client/notification" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" + "github.com/ao-data/albiondata-client/notification" "strings" ) diff --git a/client/albion_watcher.go b/client/albion_watcher.go index 02b93f8..0386c29 100644 --- a/client/albion_watcher.go +++ b/client/albion_watcher.go @@ -3,7 +3,7 @@ package client import ( "time" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) type albionProcessWatcher struct { diff --git a/client/client.go b/client/client.go index 3e23a29..2871d93 100644 --- a/client/client.go +++ b/client/client.go @@ -1,7 +1,7 @@ package client import ( - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) var version string diff --git a/client/config.go b/client/config.go index 7a48e1d..6575078 100644 --- a/client/config.go +++ b/client/config.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" "github.com/mattn/go-colorable" "github.com/sirupsen/logrus" @@ -37,6 +37,7 @@ type config struct { PrivateIngestBaseUrls string PublicIngestBaseUrls string NoCPULimit bool + PrintVersion bool } //config global config data @@ -59,6 +60,7 @@ func (config *config) SetupFlags() { if config.DisableUpload { log.Info("Upload is disabled.") } + config.setupLogs() } @@ -78,6 +80,13 @@ func (config *config) setupWebsocketFlags() { } func (config *config) setupDebugFlags() { + flag.BoolVar( + &config.PrintVersion, + "version", + false, + "Print version, then close.", + ) + flag.BoolVar( &config.Debug, "debug", diff --git a/client/decode.go b/client/decode.go index 8db98f6..6f2d02a 100644 --- a/client/decode.go +++ b/client/decode.go @@ -5,8 +5,8 @@ import ( "reflect" "strconv" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" "github.com/mitchellh/mapstructure" ) diff --git a/client/dispatcher.go b/client/dispatcher.go index e54f7d4..2a744e9 100644 --- a/client/dispatcher.go +++ b/client/dispatcher.go @@ -6,8 +6,8 @@ import ( "strings" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type dispatcher struct {} diff --git a/client/event_player_online_status.go b/client/event_player_online_status.go index 5a06629..c162ac6 100644 --- a/client/event_player_online_status.go +++ b/client/event_player_online_status.go @@ -1,8 +1,8 @@ package client import ( - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type eventPlayerOnlineStatus struct { diff --git a/client/event_skill_data.go b/client/event_skill_data.go index 6c2cd0d..d4825b4 100644 --- a/client/event_skill_data.go +++ b/client/event_skill_data.go @@ -3,8 +3,8 @@ package client import ( "strconv" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type eventSkillData struct { diff --git a/client/listener.go b/client/listener.go index 3547ac9..19e4f65 100644 --- a/client/listener.go +++ b/client/listener.go @@ -7,8 +7,8 @@ import ( "io" "os" - "github.com/broderickhyman/albiondata-client/log" - photon "github.com/broderickhyman/photon_spectator" + "github.com/ao-data/albiondata-client/log" + photon "github.com/ao-data/photon_spectator" "github.com/google/gopacket" "github.com/google/gopacket/layers" "github.com/google/gopacket/pcap" diff --git a/client/offline.go b/client/offline.go index 8aae2a0..5bd0749 100644 --- a/client/offline.go +++ b/client/offline.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) func processOffline(path string) { diff --git a/client/operation_auction_get_item_average_stats.go b/client/operation_auction_get_item_average_stats.go index 2403d73..bc67031 100644 --- a/client/operation_auction_get_item_average_stats.go +++ b/client/operation_auction_get_item_average_stats.go @@ -3,8 +3,8 @@ package client import ( "sort" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationAuctionGetItemAverageStats struct { diff --git a/client/operation_auction_get_offers.go b/client/operation_auction_get_offers.go index 8bf4ac1..eae142a 100644 --- a/client/operation_auction_get_offers.go +++ b/client/operation_auction_get_offers.go @@ -3,8 +3,8 @@ package client import ( "encoding/json" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationAuctionGetOffers struct { diff --git a/client/operation_auction_get_requests.go b/client/operation_auction_get_requests.go index ed1755c..af102cc 100644 --- a/client/operation_auction_get_requests.go +++ b/client/operation_auction_get_requests.go @@ -3,8 +3,8 @@ package client import ( "encoding/json" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationAuctionGetRequestsResponse struct { diff --git a/client/operation_get_cluster_map_info.go b/client/operation_get_cluster_map_info.go index 9191bcf..f05adf5 100644 --- a/client/operation_get_cluster_map_info.go +++ b/client/operation_get_cluster_map_info.go @@ -3,8 +3,8 @@ package client import ( "strconv" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationGetClusterMapInfo struct { diff --git a/client/operation_get_game_server_by_cluster.go b/client/operation_get_game_server_by_cluster.go index 360c466..1c60041 100644 --- a/client/operation_get_game_server_by_cluster.go +++ b/client/operation_get_game_server_by_cluster.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) type operationGetGameServerByCluster struct { diff --git a/client/operation_get_mail_infos.go b/client/operation_get_mail_infos.go index 4c1c4d1..ac192ea 100644 --- a/client/operation_get_mail_infos.go +++ b/client/operation_get_mail_infos.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) var MailInfos MailInfosLookup diff --git a/client/operation_gold_market_get_average_info.go b/client/operation_gold_market_get_average_info.go index 3048695..5f41c7f 100644 --- a/client/operation_gold_market_get_average_info.go +++ b/client/operation_gold_market_get_average_info.go @@ -1,8 +1,8 @@ package client import ( - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationGoldMarketGetAverageInfo struct { diff --git a/client/operation_join.go b/client/operation_join.go index 4d4ba3a..c23ee73 100644 --- a/client/operation_join.go +++ b/client/operation_join.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationJoinResponse struct { diff --git a/client/operation_read_mail.go b/client/operation_read_mail.go index e25074e..f69bb8a 100644 --- a/client/operation_read_mail.go +++ b/client/operation_read_mail.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/broderickhyman/albiondata-client/lib" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/lib" + "github.com/ao-data/albiondata-client/log" ) type operationReadMail struct { diff --git a/client/operation_real_estate_bid_on_auction.go b/client/operation_real_estate_bid_on_auction.go index 7af2d2d..bed76c8 100644 --- a/client/operation_real_estate_bid_on_auction.go +++ b/client/operation_real_estate_bid_on_auction.go @@ -1,7 +1,7 @@ package client import ( - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) type operationRealEstateBidOnAuction struct { diff --git a/client/operation_real_estate_get_auction_data.go b/client/operation_real_estate_get_auction_data.go index a01a8c0..b0d6902 100644 --- a/client/operation_real_estate_get_auction_data.go +++ b/client/operation_real_estate_get_auction_data.go @@ -1,7 +1,7 @@ package client import ( - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) type operationRealEstateGetAuctionData struct { diff --git a/client/router.go b/client/router.go index 5b82a67..ee7cc2f 100644 --- a/client/router.go +++ b/client/router.go @@ -4,8 +4,8 @@ import ( "encoding/gob" "os" - "github.com/broderickhyman/albiondata-client/log" - photon "github.com/broderickhyman/photon_spectator" + "github.com/ao-data/albiondata-client/log" + photon "github.com/ao-data/photon_spectator" ) //Router struct definitions diff --git a/client/uploader_http.go b/client/uploader_http.go index 67246fd..c332442 100644 --- a/client/uploader_http.go +++ b/client/uploader_http.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "net/http" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) type httpUploader struct { diff --git a/client/uploader_http_pow.go b/client/uploader_http_pow.go index 8db09b4..d5d5d41 100644 --- a/client/uploader_http_pow.go +++ b/client/uploader_http_pow.go @@ -14,7 +14,7 @@ import ( "io/ioutil" "strconv" - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" ) type httpUploaderPow struct { diff --git a/client/uploader_nats.go b/client/uploader_nats.go index 9eb741e..090b9ff 100644 --- a/client/uploader_nats.go +++ b/client/uploader_nats.go @@ -1,7 +1,7 @@ package client import ( - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" nats "github.com/nats-io/go-nats" ) diff --git a/go.mod b/go.mod index 54d79e6..44dc571 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/broderickhyman/albiondata-client +module github.com/ao-data/albiondata-client go 1.16 require ( - github.com/broderickhyman/go-githubupdate v0.0.0-20210616044731-0a6ee555c7dd - github.com/broderickhyman/photon_spectator v0.0.0-20201019232055-713aea094aa8 + github.com/ao-data/go-githubupdate v0.0.0-20230216133638-c4accecc2f64 + github.com/ao-data/photon_spectator v0.0.0-20201019232055-713aea094aa8 github.com/ctcpip/notifize v1.0.0 github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/getlantern/golog v0.0.0-20201022140317-a8d13dc71777 // indirect @@ -29,8 +29,9 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.7.1 + github.com/tc-hib/go-winres v0.3.1 // indirect + golang.org/x/net v0.6.0 // indirect golang.org/x/sys v0.5.0 - golang.org/x/tools v0.6.0 // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 gopkg.in/yaml.v2 v2.3.0 // indirect diff --git a/go.sum b/go.sum index 57ae2ec..58c4bb1 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,14 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw= +github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/ao-data/go-githubupdate v0.0.0-20230216133638-c4accecc2f64 h1:yNUKYRe3bU1XMZxcsOgbwqj6L7tYb4SaVAAPP5qvKrw= +github.com/ao-data/go-githubupdate v0.0.0-20230216133638-c4accecc2f64/go.mod h1:nCSCu7m3B57YgiBPxHM6wXq5UWlcFkFeIDNGeBePh/4= +github.com/ao-data/photon_spectator v0.0.0-20201019232055-713aea094aa8 h1:ANJqs3GIJrueorjac0ic5BJZnaEeviHtDtf6kbuZ+Tg= +github.com/ao-data/photon_spectator v0.0.0-20201019232055-713aea094aa8/go.mod h1:JQ7Dc1beNHTGTPnmGw52CwMaXBzmFwe6sToBjuz6quE= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -25,10 +31,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/broderickhyman/go-githubupdate v0.0.0-20210616044731-0a6ee555c7dd h1:524TgVkQ/45BwVq5TBEK93rXL8iYOTByCm3Q0Z7Nz/Q= -github.com/broderickhyman/go-githubupdate v0.0.0-20210616044731-0a6ee555c7dd/go.mod h1:1lB7TDteSwAagH6ymKeBmY3+GCv6XWdqG+WsGSGc/oI= -github.com/broderickhyman/photon_spectator v0.0.0-20201019232055-713aea094aa8 h1:BeS4MGsEebX9dV4Ujd2WNuhFw5hvK+31UmdwsMrZwTw= -github.com/broderickhyman/photon_spectator v0.0.0-20201019232055-713aea094aa8/go.mod h1:TAk3d2f92vDWcUt8ptoQHfGDrbfaogdolag1Ma2F7eY= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -36,6 +38,9 @@ github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/ctcpip/notifize v1.0.0 h1:pC1fq9jaQN4/h5RV7n/Rum4hUNLzMhDl40kfR/NuGzA= github.com/ctcpip/notifize v1.0.0/go.mod h1:s22nV/32b1qZqd69j+JTo9d8rZUKjNTBNmmvZ9nEOJ4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -131,6 +136,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/josephspurrier/goversioninfo v1.4.0 h1:Puhl12NSHUSALHSuzYwPYQkqa2E1+7SrtAPJorKK0C8= +github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -180,6 +187,8 @@ github.com/nats-io/nkeys v0.2.0 h1:WXKF7diOaPU9cJdLD7nuzwasQy9vT1tBqzXZZf3AMJM= github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -206,8 +215,12 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -237,9 +250,17 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tc-hib/go-winres v0.3.1 h1:9r67V7Ep34yyx8SL716BzcKePRvEBOjan47SmMnxEdE= +github.com/tc-hib/go-winres v0.3.1/go.mod h1:lTPf0MW3eu6rmvMyLrPXSy6xsSz4t5dRxB7dc5YFP6k= +github.com/tc-hib/winres v0.1.6 h1:qgsYHze+BxQPEYilxIz/KCQGaClvI2+yLBAZs+3+0B8= +github.com/tc-hib/winres v0.1.6/go.mod h1:pe6dOR40VOrGz8PkzreVKNvEKnlE8t4yR8A8naL+t7A= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -255,8 +276,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -266,6 +285,9 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb h1:fqpd0EBDzlHRCjiphRR5Zo/RSWWQlWv34418dnEixWk= +golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -278,8 +300,6 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -293,7 +313,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -308,34 +327,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -343,8 +336,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -369,8 +360,6 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -410,9 +399,11 @@ gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2/go.mod h1:s1Sn2yZos05Qfs7NK gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/icon/albiondata-client.png b/icon/albiondata-client.png new file mode 100644 index 0000000..3f32ad3 Binary files /dev/null and b/icon/albiondata-client.png differ diff --git a/notification/notification_win.go b/notification/notification_win.go index c92e42a..2e67cd0 100644 --- a/notification/notification_win.go +++ b/notification/notification_win.go @@ -3,7 +3,7 @@ package notification import ( - "github.com/broderickhyman/albiondata-client/log" + "github.com/ao-data/albiondata-client/log" toast "gopkg.in/toast.v1" ) diff --git a/pkg/nsis/Makefile b/pkg/nsis/Makefile index af32dea..e27ec4e 100644 --- a/pkg/nsis/Makefile +++ b/pkg/nsis/Makefile @@ -1,7 +1,7 @@ TOP_SRCDIR = ../.. PACKAGE = albiondata-client PACKAGE_NAME = Albion Data Client -PACKAGE_BUGREPORT = https://github.com/broderickhyman/albiondata-client/issues +PACKAGE_BUGREPORT = https://github.com/ao-data/albiondata-client/issues INSTALLER_COMPRESSION = lzma PACKAGE_EXE = albiondata-client.exe diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index 2444db3..82b737e 100755 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -4,9 +4,13 @@ set -eo pipefail sudo apt-get update && sudo apt-get install -y libpcap-dev +env | sort + go build -ldflags "-s -w -X main.version=$GITHUB_REF_NAME" albiondata-client.go -ls -la +./albiondata-client -version + +cp albiondata-client albiondata-client.old gzip -9 albiondata-client mv albiondata-client.gz update-linux-amd64.gz -ls -la \ No newline at end of file +mv albiondata-client.old albiondata-client diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh index 21daa64..87dbcab 100755 --- a/scripts/build-windows.sh +++ b/scripts/build-windows.sh @@ -2,39 +2,30 @@ set -eo pipefail -# sudo apt update && sudo apt install -y nsis nsis-pluginapi wine wine32 - -sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install -y --no-install-recommends \ - g++ \ - gcc \ - libc6-dev \ - make \ - pkg-config \ - ca-certificates \ - wget \ - git \ - ssh \ - mingw-w64 \ - nsis \ - wine-stable \ - wine32 - -export CGO_CPPFLAGS="-I $GOPATH/src/github.com/broderickhyman/albiondata-client/thirdparty/WpdPack/Include/" -export CGO_LDFLAGS="-L $GOPATH/src/github.com/broderickhyman/albiondata-client/thirdparty/WpdPack/Lib/x64/" -export GOOS=windows -export GOARCH=amd64 -export CGO_ENABLED=1 -export CXX=x86_64-w64-mingw32-g++ -export CC=x86_64-w64-mingw32-gcc -go build -ldflags "-s -w -X main.version=$GITHUB_REF_NAME" -o albiondata-client.exe -v -x albiondata-client.go - -# Add icon to the .exe -wine thirdparty/rcedit/rcedit.exe albiondata-client.exe --set-icon icon/albiondata-client.ico - -# Make the NSIS Installer +rm -f rsrc_windows_* +rm -f albiondata-client.exe +rm -f albiondata-client.*.bak +rm -f .albiondata-client.*.old + +rm -f albiondata-client-amd64-installer.exe + +go install github.com/tc-hib/go-winres@latest + +export PATH="$PATH:/root/go/bin" + +go-winres make + +env GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X main.version=$GITHUB_REF_NAME" -o albiondata-client.exe -v -x albiondata-client.go + +go-winres patch albiondata-client.exe + cd pkg/nsis make nsis + cd ../.. +ls -la albiondata-client* +cp albiondata-client.exe albiondata-client.exe.copy gzip -9 albiondata-client.exe mv albiondata-client.exe.gz update-windows-amd64.exe.gz +mv albiondata-client.exe.copy albiondata-client.exe diff --git a/systray/systray_win.go b/systray/systray_win.go index aa6f05d..f07920e 100644 --- a/systray/systray_win.go +++ b/systray/systray_win.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/broderickhyman/albiondata-client/client" + "github.com/ao-data/albiondata-client/client" - "github.com/broderickhyman/albiondata-client/icon" + "github.com/ao-data/albiondata-client/icon" "github.com/getlantern/systray" "github.com/gonutz/w32" ) diff --git a/winres/winres.json b/winres/winres.json new file mode 100644 index 0000000..2d4cf7e --- /dev/null +++ b/winres/winres.json @@ -0,0 +1,61 @@ +{ + "RT_GROUP_ICON": { + "APP": { + "0000": [ + "../icon/albiondata-client.png", + "../icon/albiondata-client.png" + ] + } + }, + "RT_MANIFEST": { + "#1": { + "0409": { + "identity": { + "name": "", + "version": "" + }, + "description": "", + "minimum-os": "win7", + "execution-level": "as invoker", + "ui-access": false, + "auto-elevate": false, + "dpi-awareness": "system", + "disable-theming": false, + "disable-window-filtering": false, + "high-resolution-scrolling-aware": false, + "ultra-high-resolution-scrolling-aware": false, + "long-path-aware": false, + "printer-driver-isolation": false, + "gdi-scaling": false, + "segment-heap": false, + "use-common-controls-v6": false + } + } + }, + "RT_VERSION": { + "#1": { + "0000": { + "fixed": { + "file_version": "0.0.0.0", + "product_version": "0.0.0.0" + }, + "info": { + "0409": { + "Comments": "", + "CompanyName": "", + "FileDescription": "", + "FileVersion": "", + "InternalName": "", + "LegalCopyright": "", + "LegalTrademarks": "", + "OriginalFilename": "", + "PrivateBuild": "", + "ProductName": "", + "ProductVersion": "", + "SpecialBuild": "" + } + } + } + } + } +} \ No newline at end of file