add -g flag for google-chrome to chromium script

refactor hugo install to use lastversion

all/modules/chromium/chromium.sh

@@ -6,8 +6,11 @@ chromium_() {
   local DEFAULT=/opt/chromium
   # local DEFAULT="$HOME/.local/share/chromium"
   local exe="/usr/bin/chromium"
+
+  [[ $1 == -g ]] && exe=$(command -v google-chrome) && shift
+  echo exe $exe
   if [[ ! -f $exe ]]; then
-    echo deb chromium not installed, checking for flatpak version
+    echo chromium/chrome not installed, checking for flatpak version
     flatpak=$(flatpak info com.github.Eloston.UngoogledChromium | grep error:)
     if [[ $flatpak ]]; then
       echo no flatpak version either - exiting && return 1
@@ -44,6 +47,8 @@ chromium_() {
     dir=${CHROMIUM_HOME:-$DEFAULT}/$instance
     exe="${exe/<dir>/$dir}"
   fi
+  mkdir -p $dir
+  echo $exe $@ --user-data-dir=$dir $url $([[ $flatpak ]] && echo "@@")
   $exe $@ --user-data-dir=$dir $url $([[ $flatpak ]] && echo "@@")
 
 }

all/modules/install/hugo-install.func

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-hugo_install () {
+hugo_install() {
     # inspried from this forum post  https://discourse.gohugo.io/t/script-to-install-latest-hugo-release-on-macos-and-ubuntu/14774/10
     # if you have run into github api anonymous access limits which happens during debugging/dev then add user and token here or sourced from a separate file
     # . ~/githubapitoken
@@ -16,7 +16,6 @@ hugo_install () {
     FORCE=false
     EFILE=""
 
-    
     # options
     # e - download and install the extended version
     # c - use 'hugoe' as the install command for extended version otherwise 'hugo' will launch extended version
@@ -45,7 +44,7 @@ hugo_install () {
         esac
     done
 
-    shift $(( OPTIND - 1 ))
+    shift $((OPTIND - 1))
 
     DEFAULT_BIN_DIR="/usr/local/bin"
     # Single optional argument is directory in which to install hugo
@@ -53,7 +52,7 @@ hugo_install () {
 
     BIN_PATH="$(which hugo$EFILE)"
     declare -A ARCHES
-    ARCHES=( ["arm64"]="ARM64" ["aarch64"]="ARM64"  ["x86_64"]="64bit" ["arm32"]="ARM"  ["armhf"]="ARM" )
+    ARCHES=(["arm64"]="ARM64" ["aarch64"]="ARM64" ["x86_64"]="64bit" ["arm32"]="ARM" ["armhf"]="ARM")
     ARCH=$(arch)
 
     if [ -z "${ARCHES[$ARCH]}" ]; then
@@ -61,41 +60,45 @@ hugo_install () {
         exit 1
     fi
 
-    
     INSTALLED="$(hugo$EFILE version 2>/dev/null | cut -d'v' -f2 | cut -c 1-6)"
     CUR_VERSION=${INSTALLED:-"None"}
-    echo $(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest | grep tag_name)
+    # echo $(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest | grep tag_name)
-    NEW_VERSION="$(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest  \
+    # NEW_VERSION="$(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest  \
-        | grep tag_name \
+    # | grep tag_name \
-    | cut -d'v' -f2 | cut -c 1-6)"
+    # | cut -d'v' -f2 | cut -c 1-6)"
 
-    echo "Hugo `[ $EXTENDED == true ] && echo "Extended"`: Current  Version : $CUR_VERSION => New Version: $NEW_VERSION"
+    NEW_VERSION=$(lastversion hugo)
 
-    if [ -z "$NEW_VERSION" ]; then
+    echo "Hugo $([ $EXTENDED == true ] && echo "Extended"): Current  Version : $CUR_VERSION => New Version: $NEW_VERSION"
-        echo  Unable to retrieve new version number - Likely you have reached github anonymous limit
+
-        echo  set environment variable `$GITHUB_USER` and `$GITHUB_TOKEN` and try again
+    # if [ -z "$NEW_VERSION" ]; then
-        exit 1
+    #     echo Unable to retrieve new version number - Likely you have reached github anonymous limit
-    fi
+    #     echo set environment variable $($GITHUB_USER) and $($GITHUB_TOKEN) and try again
+    #     exit 1
+    # fi
 
     [[ $NEW_VERSION = $CUR_VERSION ]] && [[ $FORCE = false ]] && echo Latest version already installed at $BIN_PATH && return 0
 
-    pushd /tmp/ > /dev/null
+    pushd /tmp/ >/dev/null
 
-    URL=$(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest \
+    #   curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohug#oio/hugo/releases/latest |
-        | grep "browser_download_url.*hugo.*._Linux-${ARCHES[$ARCH]}\.tar\.gz" \
+    #    grep "browser_download_url.*hugo.*._Linux-${ARCHES[$ARCH]}\.tar\.gz" |
-        | \
+
+    URL=$(
+        lastversion hugo --format assets --filter Linux-${ARCHES[$ARCH]}\.tar\.gz |
             if [ $EXTENDED = true ]; then
                 grep "_extended"
             else
                 grep -v "_extended"
-        fi \
+            fi
-        | cut -d ":" -f 2,3 \
+        # |
-        | tr -d \" \
+        # cut -d ":" -f 2,3 |
+        # tr -d \"
     )
 
     echo $URL
 
-    echo "Installing version $NEW_VERSION `[ $EXTENDED == true ] && echo "Extended"`  "
+    echo "Installing version $NEW_VERSION $([ $EXTENDED == true ] && echo "Extended")  "
     echo "This machine's architecture is $ARCH"
     echo "Downloading Tarball $URL"
 
@@ -118,9 +121,9 @@ hugo_install () {
 
     rm $TARBALL
 
-    popd > /dev/null
+    popd >/dev/null
 
-    echo Installing hugo `[ $EXTENDED == true ] && echo "extended"` as hugo$EFILE
+    echo Installing hugo $([ $EXTENDED == true ] && echo "extended") as hugo$EFILE
 
     BIN_PATH="$(which hugo$EFILE)"