Compare commits

..

No commits in common. "main" and "1.3.1" have entirely different histories.
main ... 1.3.1

4 changed files with 2 additions and 16 deletions

View File

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v4
with: with:
go-version: '1.20.2' go-version: '1.20.2'
- name: Check out code - name: Check out code

View File

@ -1,10 +1,5 @@
# Changelog # Changelog
## [1.3.2] - 08-12-2024
* Fix to Browser Dev feature:
* Checking browser dev url when internet_accessible was checking the incorrect path. This is now fixed.
## [1.3.1] - 08-12-2024 ## [1.3.1] - 08-12-2024
* Fixes to Browser Dev feature: * Fixes to Browser Dev feature:

View File

@ -1169,7 +1169,7 @@ func taskGetBrowserDevStatus() string {
func taskGetBrowserDevUrl() string { func taskGetBrowserDevUrl() string {
url := "" url := ""
myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.BrowserDevPath) + "myedgeapp.env") myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + "dev/myedgeapp.env")
if err != nil { if err != nil {
log.Println("No myedge.app environment file found. Status is Network-Only") log.Println("No myedge.app environment file found. Status is Network-Only")
url = "http://dev." + system.GetHostname() + ".local" url = "http://dev." + system.GetHostname() + ".local"

View File

@ -111,7 +111,6 @@ const ApiPath string = "apiPath"
const EdgeAppsPath string = "edgeAppsPath" const EdgeAppsPath string = "edgeAppsPath"
const EdgeAppsBackupPath string = "edgeAppsBackupPath" const EdgeAppsBackupPath string = "edgeAppsBackupPath"
const WsPath string = "wsPath" const WsPath string = "wsPath"
const BrowserDevPath string = "browserDevPath"
const LoggerPath string = "loggerPath" const LoggerPath string = "loggerPath"
const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation" const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation"
const BrowserDevProxyPath string = "browserDevProxyPath" const BrowserDevProxyPath string = "browserDevProxyPath"
@ -177,14 +176,6 @@ func GetPath(pathKey string) string {
targetPath = "/home/system/components/ws/" targetPath = "/home/system/components/ws/"
} }
case BrowserDevPath:
if env["BROWSERDEV_PATH"] != "" {
targetPath = env["BROWSERDEV_PATH"]
} else {
targetPath = "/home/system/components/dev/"
}
case LoggerPath: case LoggerPath:
if env["LOGGER_PATH"] != "" { if env["LOGGER_PATH"] != "" {
targetPath = env["LOGGER_PATH"] targetPath = env["LOGGER_PATH"]