diff --git a/backend/.air.toml b/backend/.air.toml index f127ea0..57db720 100644 --- a/backend/.air.toml +++ b/backend/.air.toml @@ -4,7 +4,7 @@ tmp_dir = "tmp" [build] args_bin = [] - bin = ".\\main.exe" + bin = "./main.exe" cmd = "make build" delay = 1000 exclude_dir = ["assets", "tmp", "vendor", "testdata", "node_modules"] diff --git a/backend/Makefile b/backend/Makefile index 8a4ff52..a564acd 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -46,15 +46,15 @@ lint: # Live Reload watch: - @powershell -ExecutionPolicy Bypass -Command "if (Get-Command air -ErrorAction SilentlyContinue) { \ + @if command -v air > /dev/null 2>&1; then \ air; \ - Write-Output 'Watching...'; \ - } else { \ - Write-Output 'Installing air...'; \ + else \ + echo "Installing air..."; \ go install github.com/air-verse/air@latest; \ - air; \ - Write-Output 'Watching...'; \ - }" + AIR_BIN="$$(go env GOBIN)"; \ + if [ -z "$$AIR_BIN" ]; then AIR_BIN="$$(go env GOPATH)/bin"; fi; \ + "$$AIR_BIN/air"; \ + fi # ---- Migrations (goose) ---- diff --git a/mobile/gradlew b/mobile/gradlew old mode 100644 new mode 100755