diff --git a/env/.local/scripts/uninstall-webapp b/env/.local/scripts/uninstall-webapp deleted file mode 100755 index fc9d582..0000000 --- a/env/.local/scripts/uninstall-webapp +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -# Uninstall's a web app, including it's icon. - -app_dir="$HOME/.local/share/applications" -spec="" -file="" - -while [[ $# -gt 0 ]]; do - if [[ $1 =~ "-f" ]] || [[ $1 =~ "--file" ]]; then - shift - file=$(jq -r '.name' $1) - else - file=$1 - fi - shift -done - -if [[ -z "$file" ]]; then - echo -e "Must supplye a web app name to uninstall.\n\n" - echo "Usage: uninstall-webapp " - exit 1 -fi - -file="$(basename $file)" -if [[ ! $file =~ \.desktop$ ]]; then - file="$file.desktop" -fi - -desktop="$app_dir/$file" - -if [[ ! -f "$desktop" ]]; then - echo "No webapp found @: $desktop" - exit 1 -fi - -icon=$(cat $desktop | grep "Icon") -icon="${icon/#Icon=/}" - -echo "Removing Application: $desktop" -rm -rf "$desktop" - -echo "Removing Icon: $icon" -rm -rf "$icon" >/dev/null 2>&1 diff --git a/webapp b/webapp index f4b40b0..e721df7 100755 --- a/webapp +++ b/webapp @@ -69,7 +69,7 @@ install() { uninstall() { local file=$DEV_ENV/env/webapps/$(basename $1) - local script="$DEV_ENV/env/.local/scripts/uninstall-webapp" + local script="$DEV_ENV/env/.local/scripts/uninstall-desktop-app" if [[ ! -x $script ]]; then log "Failed to find uninstall web app script." @@ -88,7 +88,6 @@ uninstall() { log "WEBAPP: -- grep: $grep" apps_dir=$(find $DEV_ENV/env/webapps -mindepth 1 -maxdepth 1 -type f) - for s in $apps_dir; do if basename $s | grep -vq "$grep"; then log "grep \"$grep\" filtered out $s"