Summary PR for PM v0.6 related changes

cmds/portmaster-core/pack

@@ -3,14 +3,16 @@
 baseDir="$( cd "$(dirname "$0")" && pwd )"
 cd "$baseDir"
 
-COL_OFF="\033[00m"
+COL_OFF="\033[0m"
 COL_BOLD="\033[01;01m"
 COL_RED="\033[31m"
+COL_GREEN="\033[32m"
+COL_YELLOW="\033[33m"
 
 destDirPart1="../../dist"
 destDirPart2="core"
 
-function check {
+function prep {
   # output
   output="main"
   # get version
@@ -25,46 +27,47 @@ function check {
   fi
   # build destination path
   destPath=${destDirPart1}/${platform}/${destDirPart2}/$filename
+}
+
+function check {
+  prep
 
   # check if file exists
   if [[ -f $destPath ]]; then
-    echo "[core] $platform $version already built"
+    echo "[core] $platform v$version already built"
   else
-    echo -e "${COL_BOLD}[core] $platform $version${COL_OFF}"
+    echo -e "${COL_BOLD}[core] $platform v$version${COL_OFF}"
   fi
 }
 
 function build {
-  # output
-  output="main"
-  # get version
-  version=$(grep "info.Set" main.go | cut -d'"' -f4)
-  # build versioned file name
-  filename="portmaster-core_v${version//./-}"
-  # platform
-  platform="${GOOS}_${GOARCH}"
-  if [[ $GOOS == "windows" ]]; then
-    filename="${filename}.exe"
-    output="${output}.exe"
-  fi
-  # build destination path
-  destPath=${destDirPart1}/${platform}/${destDirPart2}/$filename
+  prep
 
   # check if file exists
   if [[ -f $destPath ]]; then
-    echo "[core] $platform already built in version $version, skipping..."
+    echo "[core] $platform already built in v$version, skipping..."
     return
   fi
 
   # build
   ./build main.go
   if [[ $? -ne 0 ]]; then
-    echo -e "\n${COL_BOLD}[core] $platform: ${COL_RED}BUILD FAILED.${COL_OFF}"
+    echo -e "\n${COL_BOLD}[core] $platform v$version: ${COL_RED}BUILD FAILED.${COL_OFF}"
     exit 1
   fi
   mkdir -p $(dirname $destPath)
   cp $output $destPath
-  echo -e "\n${COL_BOLD}[core] $platform: successfully built.${COL_OFF}"
+  echo -e "\n${COL_BOLD}[core] $platform v$version: ${COL_GREEN}successfully built.${COL_OFF}"
+}
+
+function reset {
+  prep
+
+  # delete if file exists
+  if [[ -f $destPath ]]; then
+    rm $destPath
+    echo "[core] $platform v$version deleted."
+  fi
 }
 
 function check_all {
@@ -79,13 +82,22 @@ function build_all {
   GOOS=darwin GOARCH=amd64 build
 }
 
+function reset_all {
+  GOOS=linux GOARCH=amd64 reset
+  GOOS=windows GOARCH=amd64 reset
+  GOOS=darwin GOARCH=amd64 reset
+}
+
 case $1 in
   "check" )
     check_all
     ;;
   "build" )
     build_all
     ;;
+  "reset" )
+    reset_all
+    ;;
   * )
     echo ""
     echo "build list:"

cmds/portmaster-start/main.go

@@ -22,6 +22,7 @@ import (
 
 var (
 	dataDir    string
+	staging    bool
 	maxRetries int
 	dataRoot   *utils.DirStructure
 	logsRoot   *utils.DirStructure
@@ -41,8 +42,8 @@ var (
 		Use:   "portmaster-start",
 		Short: "Start Portmaster components",
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) (err error) {
-			mustLoadIndex := cmd == updatesCmd
-			if err := configureDataRoot(mustLoadIndex); err != nil {
+			mustLoadIndex := indexRequired(cmd)
+			if err := configureRegistry(mustLoadIndex); err != nil {
 				return err
 			}
 
@@ -64,8 +65,9 @@ func init() {
 	{
 		flags.StringVar(&dataDir, "data", "", "Configures the data directory. Alternatively, this can also be set via the environment variable PORTMASTER_DATA.")
 		flags.StringVar(&registry.UserAgent, "update-agent", "Start", "Sets the user agent for requests to the update server")
+		flags.BoolVar(&staging, "staging", false, "Use staging update channel (for testing only)")
 		flags.IntVar(&maxRetries, "max-retries", 5, "Maximum number of retries when starting a Portmaster component")
-		flags.BoolVar(&stdinSignals, "input-signals", false, "Emulate signals using stdid.")
+		flags.BoolVar(&stdinSignals, "input-signals", false, "Emulate signals using stdin.")
 		_ = rootCmd.MarkPersistentFlagDirname("data")
 		_ = flags.MarkHidden("input-signals")
 	}
@@ -131,34 +133,32 @@ func initCobra() {
 	portlog.SetLogLevel(portlog.CriticalLevel)
 }
 
-func configureDataRoot(mustLoadIndex bool) error {
-	// The data directory is not
-	// check for environment variable
-	// PORTMASTER_DATA
+func configureRegistry(mustLoadIndex bool) error {
+	// If dataDir is not set, check the environment variable.
 	if dataDir == "" {
 		dataDir = os.Getenv("PORTMASTER_DATA")
 	}
 
-	// if it's still empty try to auto-detect it
+	// If it's still empty, try to auto-detect it.
 	if dataDir == "" {
 		dataDir = detectInstallationDir()
 	}
 
-	// finally, if it's still empty the user must provide it
+	// Finally, if it's still empty, the user must provide it.
 	if dataDir == "" {
 		return errors.New("please set the data directory using --data=/path/to/data/dir")
 	}
 
-	// remove redundant escape characters and quotes
+	// Remove left over quotes.
 	dataDir = strings.Trim(dataDir, `\"`)
-	// initialize dataroot
+	// Initialize data root.
 	err := dataroot.Initialize(dataDir, 0755)
 	if err != nil {
 		return fmt.Errorf("failed to initialize data root: %s", err)
 	}
 	dataRoot = dataroot.Root()
 
-	// initialize registry
+	// Initialize registry.
 	err = registry.Initialize(dataRoot.ChildDir("updates", 0755))
 	if err != nil {
 		return err
@@ -177,6 +177,19 @@ func configureDataRoot(mustLoadIndex bool) error {
 	// Beta:   true,
 	// })
 
+	if stagingActive() {
+		// Set flag no matter how staging was activated.
+		staging = true
+
+		log.Println("WARNING: staging environment is active.")
+
+		registry.AddIndex(updater.Index{
+			Path:   "staging.json",
+			Stable: true,
+			Beta:   true,
+		})
+	}
+
 	return updateRegistryIndex(mustLoadIndex)
 }
 
@@ -233,3 +246,14 @@ func detectInstallationDir() string {
 
 	return parent
 }
+
+func stagingActive() bool {
+	// Check flag and env variable.
+	if staging || os.Getenv("PORTMASTER_STAGING") == "enabled" {
+		return true
+	}
+
+	// Check if staging index is present and acessible.
+	_, err := os.Stat(filepath.Join(registry.StorageDir().Path, "staging.json"))
+	return err == nil
+}

cmds/portmaster-start/pack

@@ -3,14 +3,16 @@
 baseDir="$( cd "$(dirname "$0")" && pwd )"
 cd "$baseDir"
 
-COL_OFF="\033[00m"
+COL_OFF="\033[0m"
 COL_BOLD="\033[01;01m"
 COL_RED="\033[31m"
+COL_GREEN="\033[32m"
+COL_YELLOW="\033[33m"
 
 destDirPart1="../../dist"
 destDirPart2="start"
 
-function check {
+function prep {
   # output
   output="portmaster-start"
   # get version
@@ -25,46 +27,47 @@ function check {
   fi
   # build destination path
   destPath=${destDirPart1}/${platform}/${destDirPart2}/$filename
+}
+
+function check {
+  prep
 
   # check if file exists
   if [[ -f $destPath ]]; then
     echo "[start] $platform $version already built"
   else
-    echo -e "${COL_BOLD}[start] $platform $version${COL_OFF}"
+    echo -e "${COL_BOLD}[start] $platform v$version${COL_OFF}"
   fi
 }
 
 function build {
-  # output
-  output="portmaster-start"
-  # get version
-  version=$(grep "info.Set" main.go | cut -d'"' -f4)
-  # build versioned file name
-  filename="portmaster-start_v${version//./-}"
-  # platform
-  platform="${GOOS}_${GOARCH}"
-  if [[ $GOOS == "windows" ]]; then
-    filename="${filename}.exe"
-    output="${output}.exe"
-  fi
-  # build destination path
-  destPath=${destDirPart1}/${platform}/${destDirPart2}/$filename
+  prep
 
   # check if file exists
   if [[ -f $destPath ]]; then
-    echo "[start] $platform already built in version $version, skipping..."
+    echo "[start] $platform already built in v$version, skipping..."
     return
   fi
 
   # build
   ./build
   if [[ $? -ne 0 ]]; then
-    echo -e "\n${COL_BOLD}[start] $platform: ${COL_RED}BUILD FAILED.${COL_OFF}"
+    echo -e "\n${COL_BOLD}[start] $platform v$version: ${COL_RED}BUILD FAILED.${COL_OFF}"
     exit 1
   fi
   mkdir -p $(dirname $destPath)
   cp $output $destPath
-  echo -e "\n${COL_BOLD}[start] $platform: successfully built.${COL_OFF}"
+  echo -e "\n${COL_BOLD}[start] $platform v$version: ${COL_GREEN}successfully built.${COL_OFF}"
+}
+
+function reset {
+  prep
+
+  # delete if file exists
+  if [[ -f $destPath ]]; then
+    rm $destPath
+    echo "[start] $platform v$version deleted."
+  fi
 }
 
 function check_all {
@@ -79,13 +82,22 @@ function build_all {
   GOOS=darwin GOARCH=amd64 build
 }
 
+function reset_all {
+  GOOS=linux GOARCH=amd64 reset
+  GOOS=windows GOARCH=amd64 reset
+  GOOS=darwin GOARCH=amd64 reset
+}
+
 case $1 in
   "check" )
     check_all
     ;;
   "build" )
     build_all
     ;;
+  "reset" )
+    reset_all
+    ;;
   * )
     echo ""
     echo "build list:"