Update pack scripts

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,6 +82,12 @@ 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
@@ -86,6 +95,9 @@ case $1 in
   "build" )
     build_all
     ;;
+  "reset" )
+    reset_all
+    ;;
   * )
     echo ""
     echo "build list:"