Move portmaster binary to cmds/portmaster-core

cmds/portmaster-core/.gitignore

@@ -0,0 +1,7 @@
+# Compiled binaries
+portmaster
+portmaster.exe
+dnsonly
+dnsonly.exe
+main
+main.exe

cmds/portmaster-core/build

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# get build data
+if [[ "$BUILD_COMMIT" == "" ]]; then
+  BUILD_COMMIT=$(git describe --all --long --abbrev=99 --dirty 2>/dev/null)
+fi
+if [[ "$BUILD_USER" == "" ]]; then
+  BUILD_USER=$(id -un)
+fi
+if [[ "$BUILD_HOST" == "" ]]; then
+  BUILD_HOST=$(hostname -f)
+fi
+if [[ "$BUILD_DATE" == "" ]]; then
+  BUILD_DATE=$(date +%d.%m.%Y)
+fi
+if [[ "$BUILD_SOURCE" == "" ]]; then
+  BUILD_SOURCE=$(git remote -v | grep origin | cut -f2 | cut -d" " -f1 | head -n 1)
+fi
+if [[ "$BUILD_SOURCE" == "" ]]; then
+  BUILD_SOURCE=$(git remote -v | cut -f2 | cut -d" " -f1 | head -n 1)
+fi
+BUILD_BUILDOPTIONS=$(echo $* | sed "s/ /§/g")
+
+# check
+if [[ "$BUILD_COMMIT" == "" ]]; then
+  echo "could not automatically determine BUILD_COMMIT, please supply manually as environment variable."
+  exit 1
+fi
+if [[ "$BUILD_USER" == "" ]]; then
+  echo "could not automatically determine BUILD_USER, please supply manually as environment variable."
+  exit 1
+fi
+if [[ "$BUILD_HOST" == "" ]]; then
+  echo "could not automatically determine BUILD_HOST, please supply manually as environment variable."
+  exit 1
+fi
+if [[ "$BUILD_DATE" == "" ]]; then
+  echo "could not automatically determine BUILD_DATE, please supply manually as environment variable."
+  exit 1
+fi
+if [[ "$BUILD_SOURCE" == "" ]]; then
+  echo "could not automatically determine BUILD_SOURCE, please supply manually as environment variable."
+  exit 1
+fi
+
+echo "Please notice, that this build script includes metadata into the build."
+echo "This information is useful for debugging and license compliance."
+echo "Run the compiled binary with the -version flag to see the information included."
+
+if [[ $1 == "dev" ]]; then
+  shift
+  export CGO_ENABLED=1
+  DEV="-race"
+fi
+
+# build
+BUILD_PATH="github.com/safing/portbase/info"
+go build $DEV -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $*

cmds/portmaster-core/main.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"os"
+
+	"github.com/safing/portbase/info"
+	"github.com/safing/portbase/run"
+
+	// include packages here
+	_ "github.com/safing/portbase/modules/subsystems"
+	_ "github.com/safing/portmaster/core"
+	_ "github.com/safing/portmaster/firewall"
+	_ "github.com/safing/portmaster/nameserver"
+	_ "github.com/safing/portmaster/ui"
+)
+
+func main() {
+	info.Set("Portmaster", "0.4.15", "AGPLv3", true)
+	os.Exit(run.Run())
+}

cmds/portmaster-core/pack

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+baseDir="$( cd "$(dirname "$0")" && pwd )"
+cd "$baseDir"
+
+COL_OFF="\033[00m"
+COL_BOLD="\033[01;01m"
+COL_RED="\033[31m"
+
+destDirPart1="../../dist"
+destDirPart2="core"
+
+function check {
+  # 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
+
+  # check if file exists
+  if [[ -f $destPath ]]; then
+    echo "[core] $platform $version already built"
+  else
+    echo -e "${COL_BOLD}[core] $platform $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
+
+  # check if file exists
+  if [[ -f $destPath ]]; then
+    echo "[core] $platform already built in version $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}"
+    exit 1
+  fi
+  mkdir -p $(dirname $destPath)
+  cp $output $destPath
+  echo -e "\n${COL_BOLD}[core] $platform: successfully built.${COL_OFF}"
+}
+
+function check_all {
+  GOOS=linux GOARCH=amd64 check
+  GOOS=windows GOARCH=amd64 check
+  GOOS=darwin GOARCH=amd64 check
+}
+
+function build_all {
+  GOOS=linux GOARCH=amd64 build
+  GOOS=windows GOARCH=amd64 build
+  GOOS=darwin GOARCH=amd64 build
+}
+
+case $1 in
+  "check" )
+    check_all
+    ;;
+  "build" )
+    build_all
+    ;;
+  * )
+    echo ""
+    echo "build list:"
+    echo ""
+    check_all
+    echo ""
+    read -p "press [Enter] to start building" x
+    echo ""
+    build_all
+    echo ""
+    echo "finished building."
+    echo ""
+    ;;
+esac

cmds/portmaster-start/pack

@@ -7,7 +7,7 @@ COL_OFF="\033[00m"
 COL_BOLD="\033[01;01m"
 COL_RED="\033[31m"
 
-destDirPart1="../dist"
+destDirPart1="../../dist"
 destDirPart2="start"
 
 function check {

cmds/portmaster-start/update.go

@@ -46,7 +46,7 @@ func downloadUpdates() error {
 		"all/ui/modules/base.zip",
 	)
 
-	// logging is configured as a presistent pre-run method inherited from
+	// logging is configured as a persistent pre-run method inherited from
 	// the root command but since we don't use run.Run() we need to start
 	// logging ourself.
 	err := log.Start()