diff --git a/src/trixie.sh b/src/trixie.sh index e650c89..34e159e 100755 --- a/src/trixie.sh +++ b/src/trixie.sh @@ -11,6 +11,7 @@ REQUIRED_PACKAGES=( bash-completion vim micro git wget htop jq unzip tilix + zram-tools ) # FUNCTIONS @@ -323,8 +324,8 @@ function gnome_extensions { grep -q '^please logout to take effect!' && LOGOUT_REQUIRED=true $BASEDIR/tools/gnome-extensions-helper runcat@kolesnikov.se --idle-threshold=66 | grep -q 'please logout to take effect!' && LOGOUT_REQUIRED=true - $BASEDIR/tools/gnome-extensions-helper netspeedsimplified@prateekmedia | - grep -q 'please logout to take effect!' && LOGOUT_REQUIRED=true + # $BASEDIR/tools/gnome-extensions-helper netspeedsimplified@prateekmedia.extension | + # grep -q 'please logout to take effect!' && LOGOUT_REQUIRED=true $BASEDIR/tools/gnome-extensions-helper appindicatorsupport@rgcjonas.gmail.com --tray-pos=left --icon-saturation=0.9 | grep -q 'please logout to take effect!' && LOGOUT_REQUIRED=true $BASEDIR/tools/gnome-extensions-helper weeks-start-on-monday@extensions.gnome-shell.fifi.org | @@ -401,17 +402,29 @@ function libre_re_pixmap { function clear_system_extensions { echo "# clear system gnome-shell extensions" echo "=====================================" - sudo rm /usr/share/gnome-shell/extensions/* -rf + count_system_extensions=$(ls -1 /usr/share/gnome-shell/extensions | wc -l) + [[ $count_system_extensions -gt 0 ]] && sudo rm /usr/share/gnome-shell/extensions/* -rf || true } function install_flatpak { echo "# install flatpak" echo "=================" - sudo apt install -y flatpak gnome-software-plugin-flatpak - flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + + if ! dpkg -l flatpak | grep -q ^ii; then + sudo apt install -y flatpak gnome-software-plugin-flatpak + flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + fi + if ! (echo $XDG_DATA_DIRS | grep -q flatpak); then LOGOUT_REQUIRED=true + XDG_DATA_DIRS=$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:$XDG_DATA_DIRS + export XDG_DATA_DIRS fi + + flatpak install -y org.signal.Signal + flatpak install -y com.mattermost.Desktop + flatpak install -y net.jami.Jami + } ## MAIN diff --git a/tools/gnome-extensions-helper b/tools/gnome-extensions-helper index 660d86f..65ce2d9 100755 --- a/tools/gnome-extensions-helper +++ b/tools/gnome-extensions-helper @@ -151,4 +151,4 @@ parse_options $* install_extension define_settings enable_extension -[[ $LOGOUT_NEEDED == 'true' ]] && echo "please logout to take effect!" || true +[[ $LOGOUT_NEEDED == true ]] && echo "please logout to take effect!" || true