diff --git a/manjaro2archcachy.sh b/manjaro2archcachy.sh index ad2a25e..b113c7c 100644 --- a/manjaro2archcachy.sh +++ b/manjaro2archcachy.sh @@ -85,8 +85,8 @@ fi # For some reason, pacman -Qqs "manjaro" will do that. log "Checking for soon-to-be Manjaro orphans..." deps_remove=( - $(pacman -Qqs "manjaro-") - $(pacman -Qqs "\-manjaro") + $(pacman -Qqs "manjaro-") + $(pacman -Qqs "\-manjaro") pacman-mirrors ) printf "Found:\n${deps_remove[@]}\n" @@ -204,6 +204,14 @@ if [[ $(echo $XDG_CURRENT_DESKTOP | grep -i "kde") ]]; then fi fi +log "Checking for Octopi..." +if ! is_installed octopi; then + prompt_bool "Install Octopi (to replace Pamac)?" true + if [[ $? ]]; then + deps_install+=("octopi") + fi +fi + log "Fetching all system packages to replace with CachyOS+Arch packages..." # Credit to https://insrt.uk/post/pacman-reinstall for this solution. deps_install+=($(comm -12 <(pacman -Slq | sort -u) <(pacman -Qq | sort -u)))