fixed merge conflict

This commit is contained in:
Ohio2 2021-07-07 12:16:52 +02:00
commit 9da4bc82dc

6
aps
View file

@ -118,7 +118,7 @@ upgrade() { # --- upgrades
unset pkg_config_depends
done
}
help(){ # --- displays help
help(){
echo 'To install locally, do:'
echo 'aps install'
echo
@ -132,9 +132,6 @@ help(){ # --- displays help
echo 'aps upgrade'
echo
}
local_installed_list(){ # --- local installed list
ls ${installed_pkg_database}
}
main() { # --- does soem stuff
if [ -f "${lock}" ]; then
echo "[E] A lock file already exists. If you're sure no package manager is running, remove the file ${lock}."
@ -150,7 +147,6 @@ main() { # --- does soem stuff
install_package_from_repo "official" "${2}" ;;
upgrade) upgrade "official" ;;
help) help ;;
list) local_installed_list ;;
*) die "[E] Invalid option ${1}, exiting..." ;;
esac
rm "${lock}"