From 49920c442afacd3ab90b86c4a656270b7b40a3b7 Mon Sep 17 00:00:00 2001
From: "kebler.net" <kebler.net@gmail.com>
Date: Sat, 23 Oct 2021 23:40:37 -0700
Subject: [PATCH] feat:  supports chromium binary via faltpak feat: will
 propery handle instance, url and additional options

---
 all/modules/chromium/chromium.sh | 72 +++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/all/modules/chromium/chromium.sh b/all/modules/chromium/chromium.sh
index ea25a70..0cdd614 100755
--- a/all/modules/chromium/chromium.sh
+++ b/all/modules/chromium/chromium.sh
@@ -1,36 +1,52 @@
 #!/bin/bash
 
-# user to start MUST be first in arguments 
+# user to start MUST be first in arguments
 # if not supplied then will use default
-chromium_ () {
-local DEFAULT=/opt/chromium
-# local DEFAULT="$HOME/.local/share/chromium"
-local exe="/usr/bin/chromium"
-[[ ! $exe ]] && echo chromium not installed set && return 1
-user=${CHROMIUM_USER}
-[[ $1 && ( ! $1 == -* )  ]] && user=$1 && shift  
-[[ $1 && ( ! $1 == -* )  ]] && url=$1 && shift  
-user=${user:-$USER}
-if [[ $user == "$USER" ]]; then
-  unset CHROME_CONFIG_HOME
-  echo starting chromium for $USER in default directory within users home
-  echo $exe "$@" 
-  $exe "$@" 
- else 
-  [[ $user == "incognito" ]] && set -- "$@" "-incognito"
-  dir=${CHROMIUM_HOME:-$DEFAULT}
-  echo "$exe $@ --user-data-dir=$dir/$user"
-  "$exe" "$@" --user-data-dir="$dir"/"$user" $url
+chromium_() {
+  local DEFAULT=/opt/chromium
+  # local DEFAULT="$HOME/.local/share/chromium"
+  local exe="/usr/bin/chromium"
+  if [[ ! -f $exe ]]; then
+    echo deb chromium 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
+    else
+      flatpak=true
+      exe="/usr/bin/flatpak run --branch=stable --arch=x86_64 --filesystem=<dir> --command=/app/bin/chromium --file-forwarding com.github.Eloston.UngoogledChromium @@u"
+    fi
   fi
+
+  local instance=${CHROMIUM_INSTANCE}
+  [[ $1 && (! $1 == -*) ]] && instance=$1 && shift
+  [[ $1 && (! $1 == -*) ]] && url=$1 && shift
+  if [[ $instance =~ http[s]?:\/\/ ]]; then
+    url=$instance
+    instance=""
+    if [[ $url =~ ^-+ ]]; then
+      url=""
+      set -- "$@" $url
+      url=""
+    fi
+  fi
+
+  local dir
+  if [[ ! $instance ]]; then
+    unset CHROME_CONFIG_HOME
+    $HOME/.config/chromium
+    echo starting chromium for $USER in
+    dir=$HOME/.config/chromium
+    exe="${exe/<dir>/$dir}"
+    # echo $exe "$@" $([[ $flatpak ]] && echo " @@")
+    # $exe "$@"
+  else
+    [[ $instance == "incognito" ]] && set -- "$@" "-incognito"
+    dir=${CHROMIUM_HOME:-$DEFAULT}/$instance
+    exe="${exe/<dir>/$dir}"
+  fi
+  $exe $@ --user-data-dir=$dir $url $([[ $flatpak ]] && echo "@@")
+
 }
 
 # # if script was executed then call the function
 (return 0 2>/dev/null) || chromium_ $@
-
-
-
-
-
-
-
-