Pglet v0.2.0 support

- Requires Pglet v0.2.0
- ARM architectures support
- PGLET_TICKER to enable event ticker

Author: FeodorFitsner

pglet.sh

@@ -1,5 +1,5 @@
 # Constants
-PGLET_VER="0.1.12"        # Pglet version required by this script
+PGLET_VER="0.2.0"        # Pglet version required by this script
 
 # Default session variables:
 PGLET_EXE=""             # full path to Pglet executable
@@ -40,6 +40,10 @@ function pglet_page() {
         pargs+=(--no-window)
     fi
 
+    if [[ "$PGLET_TICKER" != "" ]]; then
+        pargs+=(--ticker $PGLET_TICKER)
+    fi    
+
     # execute pglet and get page connection ID
     local page_results=`$PGLET_EXE "${pargs[@]}"`
     IFS=' ' read -r PGLET_CONNECTION_ID PGLET_PAGE_URL <<< "$page_results"
@@ -86,6 +90,10 @@ function pglet_app() {
         pargs+=(--no-window)
     fi
 
+    if [[ "$PGLET_TICKER" != "" ]]; then
+        pargs+=(--ticker $PGLET_TICKER)
+    fi    
+
     # reset vars
     PGLET_PAGE_URL=""
 
@@ -120,7 +128,7 @@ function pglet_send() {
     echo "$cmd" > "$conn_id"
 
     # take result if command doesn't end with "f" (fire-and-forget)
-    if [[ "$cmd" =~ ^[[:space:]]*[A-Za-z]+f ]]; then
+    if [[ "$cmd" =~ \s*\w*f ]]; then
         return
     fi
 
@@ -202,7 +210,7 @@ function pglet_wait_event() {
         local conn_id=$PGLET_CONNECTION_ID
     fi
 
-    IFS=' ' read PGLET_EVENT_TARGET PGLET_EVENT_NAME PGLET_EVENT_DATA < "$conn_id.events"
+    read PGLET_EVENT_TARGET PGLET_EVENT_NAME PGLET_EVENT_DATA < "$conn_id.events"
 }
 
 function pglet_dispatch_events() {
@@ -228,19 +236,32 @@ function pglet_dispatch_events() {
 }
 
 function __pglet_install() {
-    if [ "$(uname -m)" != "x86_64" ]; then
-        echo "Error: Unsupported architecture $(uname -m). Only x64 binaries are available." 1>&2
-        exit 1
-    fi
 
     if [ "$OS" = "Windows_NT" ]; then
         echo "Error: Bash for Windows is not supported." 1>&2
         exit 1
+    fi
+
+    platform=$(uname -s)
+    if [[ $platform == Darwin ]]; then
+        platform="darwin"
+    elif [[ $platform == Linux ]]; then
+        platform="linux"
+    else
+        echo "Error: Unsupported platform $platform." 1>&2
+        exit 1
+    fi
+
+    arch=$(uname -m)
+    if [[ $arch == x86_64 ]] || [[ $arch == amd64 ]]; then
+        arch="amd64"
+    elif [[ $arch == arm64 ]] || [[ $arch == aarch64 ]]; then
+        arch="arm64"
+    elif [[ $arch == arm ]] || [[ $arch == armv7l ]]; then
+        arch="arm"
     else
-        case $(uname -s) in
-        Darwin) target="darwin-amd64.tar.gz" ;;
-        *) target="linux-amd64.tar.gz" ;;
-        esac
+        echo "Error: Unsupported architecture $arch." 1>&2
+        exit 1
     fi
 
     # check if pglet.exe is in PATH already (development mode)
@@ -271,13 +292,11 @@ function __pglet_install() {
             mkdir -p "$pglet_bin"
         fi
 
-        local pglet_url="https://github.com/pglet/pglet/releases/download/v${ver}/pglet-${target}"
+        local pglet_url="https://github.com/pglet/pglet/releases/download/v${ver}/pglet-${ver}-${platform}-${arch}.tar.gz"
         local tempTar="$HOME/.pglet/pglet.tar.gz"
         curl -fsSL $pglet_url -o $tempTar
         tar zxf $tempTar -C $pglet_bin
         rm $tempTar
-
-        #echo "OK"
     fi
 }