diff --git a/helper_scripts/command_exists.sh b/helper_scripts/command_exists.sh new file mode 100644 index 0000000000000000000000000000000000000000..7bf7bf854600706ab2f56314347c9c14d9c891db --- /dev/null +++ b/helper_scripts/command_exists.sh @@ -0,0 +1,10 @@ +command_exists() { + cmd=$1 + + if command -v $cmd &> /dev/null + then + true + else + false + fi +} diff --git a/setup.sh b/setup.sh index bc6a5ce728cc70f3d0f8b16b029e9c4fa900efb9..941f0f428d858492151f9d85a3b98dda97f1e27b 100644 --- a/setup.sh +++ b/setup.sh @@ -4,6 +4,7 @@ INSTALLER_DIR=$(dirname "${BASH_SOURCE[0]}") HELPER_SCRIPTS_DIR="$INSTALLER_DIR/helper_scripts" source "$HELPER_SCRIPTS_DIR/packages.sh" +source "$HELPER_SCRIPTS_DIR/command_exists.sh" NONE_IDENTIFIER="none" NONE_TEXT="None" @@ -65,6 +66,10 @@ main() { --extra-vars "dconf_config_path='$dconf_config_path' vscode_config_path='$vscode_config_path' vscode_extensions_path='$vscode_extensions_path' swap_sizes='$swap_sizes' git_config_path='$git_config_path'" \ --inventory "${INSTALLER_DIR}/ansible_inventory.ini" \ $(IFS=' ' echo "${additional_ansible_args[*]}") + + if command_exists flatpak; then + echo "If you have set your system theme to dark, you may need to update your Flatpak packages. You can use update.sh to do so." + fi } main diff --git a/update.sh b/update.sh index ac4dc41aa59918077159dd0eb965187a16c59469..fef5fc0b4b57cb5a550d3fbdfcccbd5d8d353d39 100644 --- a/update.sh +++ b/update.sh @@ -4,6 +4,7 @@ INSTALLER_DIR=$(dirname "${BASH_SOURCE[0]}") HELPER_SCRIPTS_DIR="$INSTALLER_DIR/helper_scripts" source "$HELPER_SCRIPTS_DIR/package_manager_identifiers.sh" +source "$HELPER_SCRIPTS_DIR/command_exists.sh" declare -A PACKAGE_MANAGERS PACKAGE_MANAGERS=( @@ -24,17 +25,6 @@ ORDERED_PACKAGE_MANAGERS=( "$MAINLINE_KERNEL_IDENTIFIER" ) -command_exists() { - cmd=$1 - - if command -v $cmd &> /dev/null - then - true - else - false - fi -} - main() { possible_package_managers=("${DEFAULT_PACKAGE_MANAGERS[@]}")