diff --git a/apps/Angry IP scanner/uninstall b/apps/Angry IP scanner/uninstall index 55d53997d67..84f1888ae3b 100755 --- a/apps/Angry IP scanner/uninstall +++ b/apps/Angry IP scanner/uninstall @@ -1,4 +1,4 @@ #!/bin/bash purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" diff --git a/apps/Intellij IDEA/uninstall b/apps/Intellij IDEA/uninstall index 403577af4c2..7e0899d59be 100755 --- a/apps/Intellij IDEA/uninstall +++ b/apps/Intellij IDEA/uninstall @@ -2,7 +2,7 @@ purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" sudo rm -rf /opt/ideaIC /usr/share/applications/intellijidea.desktop # cleanup files leftover from potential failed install diff --git a/apps/Minecraft Java Prism Launcher/uninstall b/apps/Minecraft Java Prism Launcher/uninstall index 7b9d7fa9565..cd56d626b9a 100755 --- a/apps/Minecraft Java Prism Launcher/uninstall +++ b/apps/Minecraft Java Prism Launcher/uninstall @@ -2,4 +2,4 @@ purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" diff --git a/apps/Minecraft Java Server/uninstall b/apps/Minecraft Java Server/uninstall index 23af6c20246..472b1e24462 100755 --- a/apps/Minecraft Java Server/uninstall +++ b/apps/Minecraft Java Server/uninstall @@ -16,7 +16,7 @@ if [[ "$1" != "update" ]];then sudo systemctl daemon-reload purge_packages || error "Dependencies failed to uninstall" - remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list + rm_external_repo "adoptium" remove_repofile_if_unused /etc/apt/sources.list.d/adoptopenjdk.list else echo "Uninstall skipped because run from the updater" diff --git a/apps/Pycharm CE/uninstall b/apps/Pycharm CE/uninstall index 86bce57485d..7cede4c3e26 100755 --- a/apps/Pycharm CE/uninstall +++ b/apps/Pycharm CE/uninstall @@ -2,7 +2,7 @@ purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" echo "Deleting /opt/pycharm-community directory" sudo rm -rf /opt/pycharm-community || error "Failed to delete /opt/pycharm-community directory" diff --git a/apps/Shattered Pixel Dungeon/uninstall b/apps/Shattered Pixel Dungeon/uninstall index 5faf3004ca8..c75ba2f6c5b 100755 --- a/apps/Shattered Pixel Dungeon/uninstall +++ b/apps/Shattered Pixel Dungeon/uninstall @@ -1,6 +1,6 @@ #!/bin/bash purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" rm -f ~/.local/share/applications/shatteredpd.desktop ~/.local/bin/ShatteredPD-Desktop.jar diff --git a/apps/Unciv/uninstall b/apps/Unciv/uninstall index 62f4b0218cf..5cca4e0b3dd 100755 --- a/apps/Unciv/uninstall +++ b/apps/Unciv/uninstall @@ -6,7 +6,7 @@ if [[ "$1" != "update" ]]; then purge_packages || exit 1 - remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list + rm_external_repo "adoptium" else echo "Uninstall skipped because run from the updater" fi diff --git a/apps/WorldPainter/uninstall b/apps/WorldPainter/uninstall index 74878921e2e..6646e80fe33 100755 --- a/apps/WorldPainter/uninstall +++ b/apps/WorldPainter/uninstall @@ -3,4 +3,4 @@ sudo rm -f /opt/worldpainter/.install4j/pref_jre.cfg purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" diff --git a/apps/Xtreme Download Manager/uninstall b/apps/Xtreme Download Manager/uninstall index f81f3f8fb79..2bcccd166f6 100755 --- a/apps/Xtreme Download Manager/uninstall +++ b/apps/Xtreme Download Manager/uninstall @@ -1,6 +1,6 @@ #!/bin/bash purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium" sudo rm -rf /opt/xdman || error "Failed to remove /opt/xdman/ directpry!" sudo rm -f /usr/share/applications/xdman.desktop || error "Failed to remove menu shortcut!" diff --git a/apps/jGRASP IDE/uninstall b/apps/jGRASP IDE/uninstall index 8018445aef1..78b4ec7080c 100755 --- a/apps/jGRASP IDE/uninstall +++ b/apps/jGRASP IDE/uninstall @@ -3,4 +3,4 @@ rm -rf ~/jgrasp.zip ~/jgrasp purge_packages || exit 1 -remove_repofile_if_unused /etc/apt/sources.list.d/adoptium.list +rm_external_repo "adoptium"