Better checks and logging, test for failure case

Author: OleHusgaard

modules/setting/setting.go

@@ -456,12 +456,21 @@ func getAppPath() (string, error) {
 	if snap != "" && strings.HasPrefix(appPath, snap) {
 		split := strings.Split(appPath, "/")
 		if len(split) >= 3 {
+			oldAppPath := appPath
 			split[len(split)-2] = "current"
-			appPath = strings.Join(split, "/")
+			newAppPath := strings.Join(split, "-")
+			appPath, err = exec.LookPath(newAppPath)
+			if err != nil {
+				appPath = oldAppPath
+				log.error("Could not change AppPath from %s to %s while running in snap. Hooks for new repositories may fail after snap upgrades.", oldAppPath, newAppPath)
+			} else {
+				appPath = newAppPath
+				log.debug("Apppath changed from %s to %s because we are running in snap.", oldAppPath, newAppPath)
+			}
 		}
 	}
 
-	return appPath, err
+	return appPath, nil
 }
 
 func getWorkPath(appPath string) string {