diff --git a/README.md b/README.md index 6bed8e8..1a2ea80 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
Postwoman
-

Postwoman Proxy

+

Proxywoman

API request builder - Helps you create your requests faster, saving you precious time on your development.

diff --git a/build.sh b/build.sh index c2a7621..d1acad4 100755 --- a/build.sh +++ b/build.sh @@ -32,9 +32,9 @@ OUTPUT_DIR="out/$PLATFORM-$BUILD_TYPE" # Handle special build: server if [ "$BUILD_TYPE" = "server" ]; then if [ "$PLATFORM" = "windows" ]; then - GOOS="$PLATFORM" go build -o "$OUTPUT_DIR/postwoman-proxy-server.exe" server/server.go + GOOS="$PLATFORM" go build -o "$OUTPUT_DIR/proxywoman-server.exe" server/server.go else - GOOS="$PLATFORM" go build -o "$OUTPUT_DIR/postwoman-proxy-server" server/server.go + GOOS="$PLATFORM" go build -o "$OUTPUT_DIR/proxywoman-server" server/server.go fi exit fi @@ -56,16 +56,16 @@ fi cp -r "resources/$PLATFORM/." "$OUTPUT_DIR/" if [ "$PLATFORM" = "darwin" ]; then - mkdir -p "$OUTPUT_DIR/PostwomanProxy.app/Contents/MacOS" - mkdir -p "$OUTPUT_DIR/PostwomanProxy.app/Contents/MacOS/icons" - cp icons/icon.png "$OUTPUT_DIR/PostwomanProxy.app/Contents/MacOS/icons/" - GOOS="darwin" go build -o "$OUTPUT_DIR/PostwomanProxy.app/Contents/MacOS/postwoman-proxy" + mkdir -p "$OUTPUT_DIR/Proxywoman.app/Contents/MacOS" + mkdir -p "$OUTPUT_DIR/Proxywoman.app/Contents/MacOS/icons" + cp icons/icon.png "$OUTPUT_DIR/Proxywoman.app/Contents/MacOS/icons/" + GOOS="darwin" GO111MODULE=on go build -o "$OUTPUT_DIR/Proxywoman.app/Contents/MacOS/postwoman-proxy" elif [ "$PLATFORM" = "windows" ]; then [ -f "rsrc.syso" ] && rm rsrc.syso go get github.com/akavel/rsrc rsrc -manifest="$OUTPUT_DIR/postwoman-proxy.manifest" -ico="icons/icon.ico" -o rsrc.syso - GOOS="windows" go build -ldflags -H=windowsgui -o "$OUTPUT_DIR/postwoman-proxy.exe" + GOOS="windows" GO111MODULE=on go build -ldflags -H=windowsgui -o "$OUTPUT_DIR/proxywoman.exe" mkdir $OUTPUT_DIR/icons cp icons/icon.png "$OUTPUT_DIR/icons/icon.png" @@ -75,6 +75,6 @@ elif [ "$PLATFORM" = "windows" ]; then rm $OUTPUT_DIR/postwoman-proxy.manifest rm rsrc.syso elif [ "$PLATFORM" = "linux" ]; then - echo "NOTICE: postwoman-proxy is untested and currently unsupported on Linux." - GOOS="linux" go build -o "$OUTPUT_DIR/postwoman-proxy" + echo "NOTICE: Proxywoman is untested and currently unsupported on Linux." + GOOS="linux" GO111MODULE=on go build -o "$OUTPUT_DIR/proxywoman" fi diff --git a/dist/config.yaml b/dist/config.yaml deleted file mode 100644 index 3579cc6..0000000 --- a/dist/config.yaml +++ /dev/null @@ -1,90 +0,0 @@ -project_name: postwoman-proxy -release: - github: - owner: postwoman-io - name: postwoman-proxy - name_template: Postwoman Proxy v{{.Version}} -scoop: - name: postwoman-proxy - commit_author: - name: goreleaserbot - email: goreleaser@carlosbecker.com - commit_msg_template: Scoop update for {{ .ProjectName }} version {{ .Tag }} -builds: -- id: postwoman-proxy - goos: - - darwin - - linux - - windows - goarch: - - amd64 - - "386" - goarm: - - "6" - targets: - - darwin_amd64 - - linux_amd64 - - linux_386 - - windows_amd64 - - windows_386 - ignore: - - goos: darwin - goarch: "386" - goarm: "" - gomips: "" - dir: . - main: . - ldflags: - - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser - binary: postwoman-proxy - env: - - CGO_ENABLED=1 - - GO111MODULE=on - lang: go -archives: -- id: default - builds: - - postwoman-proxy - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}' - replacements: - "386": i386 - amd64: x86_64 - darwin: Darwin - linux: Linux - windows: Windows - format: tar.gz - files: - - licence* - - LICENCE* - - license* - - LICENSE* - - readme* - - README* - - changelog* - - CHANGELOG* -snapshot: - name_template: '{{ .Tag }}-next' -checksum: - name_template: checksums.txt - algorithm: sha256 -changelog: - filters: - exclude: - - '^docs:' - - '^test:' - sort: asc -dist: dist -env_files: - github_token: ~/.config/goreleaser/github_token - gitlab_token: ~/.config/goreleaser/gitlab_token - gitea_token: ~/.config/goreleaser/gitea_token -before: - hooks: - - go mod download -source: - name_template: '{{ .ProjectName }}-{{ .Version }}' - format: tar.gz -github_urls: - download: https://github.com -gitlab_urls: - download: https://gitlab.com diff --git a/dist/postwoman-proxy_darwin_amd64/postwoman-proxy b/dist/postwoman-proxy_darwin_amd64/postwoman-proxy deleted file mode 100644 index eb3f4f3..0000000 Binary files a/dist/postwoman-proxy_darwin_amd64/postwoman-proxy and /dev/null differ diff --git a/dist/postwoman-proxy_windows_386/postwoman-proxy.exe b/dist/postwoman-proxy_windows_386/postwoman-proxy.exe deleted file mode 100644 index 59f32f9..0000000 Binary files a/dist/postwoman-proxy_windows_386/postwoman-proxy.exe and /dev/null differ diff --git a/dist/postwoman-proxy_windows_amd64/postwoman-proxy.exe b/dist/postwoman-proxy_windows_amd64/postwoman-proxy.exe deleted file mode 100644 index 6b8a35d..0000000 Binary files a/dist/postwoman-proxy_windows_amd64/postwoman-proxy.exe and /dev/null differ diff --git a/go.mod b/go.mod index 4801453..1674cd6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/40a/go-powershell v0.0.0-20170206184816-8a975e1f46d2 // indirect github.com/KnicKnic/go-powershell v0.0.8 // indirect - github.com/akavel/rsrc v0.8.0 // indirect + github.com/akavel/rsrc v0.9.0 // indirect github.com/atotto/clipboard v0.1.2 github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e // indirect github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa // indirect diff --git a/go.sum b/go.sum index bfa8db5..d7483da 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,8 @@ github.com/KnicKnic/go-powershell v0.0.8/go.mod h1:1NuEA+s0LRuwaus0jBS5CT5diK5nh github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I= github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw= github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= +github.com/akavel/rsrc v0.9.0 h1:HwUDC0+tMFWqN4D5G+o5siGD4oVsC3jn6zM8ocjc3nY= +github.com/akavel/rsrc v0.9.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e h1:KCjb01YiNoRaJ5c+SbnPLWjVzU9vqRYHg3e5JcN50nM= diff --git a/installers/windows/inno-setup-installer.iss b/installers/windows/inno-setup-installer.iss index 2a46214..06bad26 100644 --- a/installers/windows/inno-setup-installer.iss +++ b/installers/windows/inno-setup-installer.iss @@ -1,11 +1,11 @@ -; Inno Setup 6.0 Script for the Postwoman Proxy. +; Inno Setup 6.0 Script for the Proxywoman. ; Created by NBTX. -#define MyAppName "Postwoman Proxy" +#define MyAppName "Proxywoman" #define MyAppVersion "1.0" #define MyAppPublisher "Postwoman.io" #define MyAppURL "https://postwoman.io/" -#define MyAppExeName "postwoman-proxy.exe" +#define MyAppExeName "proxywoman.exe" [Setup] ; Randomly generated GUID. @@ -24,7 +24,7 @@ UsedUserAreasWarning=no ;PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog OutputDir=..\..\out\windows-desktop\installer -OutputBaseFilename=Install Postwoman Proxy +OutputBaseFilename=Install Proxywoman SetupIconFile=..\..\icons\icon.ico Compression=lzma SolidCompression=yes diff --git a/libproxy/crypto.go b/libproxy/crypto.go index cf02d15..fef8264 100644 --- a/libproxy/crypto.go +++ b/libproxy/crypto.go @@ -108,13 +108,13 @@ func EnsurePrivateKeyInstalled () error { if runtime.GOOS == "darwin" { _ = exec.Command("open", GetDataPath()).Run(); - _, _ = dlgs.Warning("Postwoman Proxy", "Postwoman needs you to install a root certificate authority (cert.pem).\nPlease double-click the certificate file to open it in Keychain Access and follow the installation and trust process.\n\nFor more information about this process and why it's required, please click the Postwoman icon in the status tray and select 'Help'.\n\nClick OK when you have installed the certificate and marked it as trusted."); + _, _ = dlgs.Warning("Proxywoman", "Proxywoman needs you to install a root certificate authority (cert.pem).\nPlease double-click the certificate file to open it in Keychain Access and follow the installation and trust process.\n\nFor more information about this process and why it's required, please click the Postwoman icon in the status tray and select 'Help'.\n\nClick OK when you have installed the certificate and marked it as trusted."); } if runtime.GOOS == "windows" { _ = exec.Command("explorer.exe", GetDataPath() + string(os.PathSeparator) + "cert.cer").Run(); - _, _ = dlgs.Warning("Postwoman Proxy", "Postwoman needs you to install a root certificate authority (cert.cer).\nPlease install the certificate (opened) into the 'Trusted Root Certification Authorities' store for the Local Machine.\n\nFor more information about this process and why it's required, please click the Postwoman icon in the system tray and select 'Help'.\n\nClick OK when you have installed the certificate and marked it as trusted."); + _, _ = dlgs.Warning("Proxywoman", "Proxywoman needs you to install a root certificate authority (cert.cer).\nPlease install the certificate (opened) into the 'Trusted Root Certification Authorities' store for the Local Machine.\n\nFor more information about this process and why it's required, please click the Postwoman icon in the system tray and select 'Help'.\n\nClick OK when you have installed the certificate and marked it as trusted."); } return err; diff --git a/main.go b/main.go index de999e8..0618212 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,7 @@ func main() { func onReady() { systray.SetIcon(icon.Data); - systray.SetTooltip("Postwoman Proxy v1.0.0 - created by NBTX"); + systray.SetTooltip("Proxyman v1.0.0 - created by NBTX"); /** Set up menu items. **/ @@ -47,7 +47,7 @@ func onReady() { systray.AddSeparator(); // Quit Proxy - mQuit := systray.AddMenuItem("Quit Postwoman Proxy", ""); + mQuit := systray.AddMenuItem("Quit Proxywoman", ""); /** Start proxy server. **/ go runPostwomanProxy(); @@ -60,20 +60,20 @@ func onReady() { case <- mCopyAccessToken.ClickedCh: _ = clipboard.WriteAll(libproxy.GetAccessToken()); - _ = notifier.Notify("Postwoman Proxy", "Proxy Access Token copied...", "The Proxy Access Token has been copied to your clipboard.", notifier.GetIcon()); + _ = notifier.Notify("Proxywoman", "Proxy Access Token copied...", "The Proxy Access Token has been copied to your clipboard.", notifier.GetIcon()); case <- mViewHelp.ClickedCh: - _ = browser.OpenURL("https://github.com/NBTX/postwoman-proxy/wiki"); + _ = browser.OpenURL("https://github.com/postwoman-io/proxywoman/wiki"); case <- mSetAccessToken.ClickedCh: - newAccessToken, success := inputbox.InputBox("Postwoman Proxy", "Please enter the new Proxy Access Token...\n(Leave this blank to disable access checks.)", ""); + newAccessToken, success := inputbox.InputBox("Proxywoman", "Please enter the new Proxy Access Token...\n(Leave this blank to disable access checks.)", ""); if success { libproxy.SetAccessToken(newAccessToken); if len(newAccessToken) == 0 { - _ = notifier.Notify("Postwoman Proxy", "Proxy Access check disabled.", "**Anyone can access your proxy server!** The Proxy Access Token check has been disabled.", notifier.GetIcon()); + _ = notifier.Notify("Proxywoman", "Proxy Access check disabled.", "**Anyone can access your proxy server!** The Proxy Access Token check has been disabled.", notifier.GetIcon()); }else{ - _ = notifier.Notify("Postwoman Proxy", "Proxy Access Token updated...", "The Proxy Access Token has been updated.", notifier.GetIcon()); + _ = notifier.Notify("Proxywoman", "Proxy Access Token updated...", "The Proxy Access Token has been updated.", notifier.GetIcon()); } } diff --git a/resources/darwin/PostwomanProxy.app/Contents/Info.plist b/resources/darwin/Proxywoman.app/Contents/Info.plist similarity index 94% rename from resources/darwin/PostwomanProxy.app/Contents/Info.plist rename to resources/darwin/Proxywoman.app/Contents/Info.plist index 0594038..5a6c507 100644 --- a/resources/darwin/PostwomanProxy.app/Contents/Info.plist +++ b/resources/darwin/Proxywoman.app/Contents/Info.plist @@ -5,7 +5,7 @@ LSBackgroundOnly CFBundleDisplayName - PostwomanProxy + Proxywoman CFBundleExecutable postwoman-proxy CFBundleIconFile @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - PostwomanProxy + Proxywoman CFBundlePackageType APPL CFBundleShortVersionString diff --git a/resources/darwin/PostwomanProxy.app/Contents/Resources/postwoman.icns b/resources/darwin/Proxywoman.app/Contents/Resources/postwoman.icns similarity index 100% rename from resources/darwin/PostwomanProxy.app/Contents/Resources/postwoman.icns rename to resources/darwin/Proxywoman.app/Contents/Resources/postwoman.icns diff --git a/resources/darwin/README.md b/resources/darwin/README.md index bd40e64..f1b404b 100644 --- a/resources/darwin/README.md +++ b/resources/darwin/README.md @@ -1,4 +1,4 @@ -# Postwoman Proxy: Darwin Build +# Proxywoman: Darwin Build ## resources/darwin diff --git a/resources/linux/README.md b/resources/linux/README.md index 7d2ded2..b4417bf 100644 --- a/resources/linux/README.md +++ b/resources/linux/README.md @@ -1 +1 @@ -# Postwoman Proxy: Linux Build +# Proxywoman: Linux Build diff --git a/resources/windows/postwoman-proxy.manifest b/resources/windows/postwoman-proxy.manifest index af821d5..486a1dc 100644 --- a/resources/windows/postwoman-proxy.manifest +++ b/resources/windows/postwoman-proxy.manifest @@ -1,6 +1,6 @@ - +