fixed merge conflict
This commit is contained in:
commit
9da4bc82dc
1 changed files with 2 additions and 6 deletions
8
aps
8
aps
|
@ -118,7 +118,7 @@ upgrade() { # --- upgrades
|
||||||
unset pkg_config_depends
|
unset pkg_config_depends
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
help(){ # --- displays help
|
help(){
|
||||||
echo 'To install locally, do:'
|
echo 'To install locally, do:'
|
||||||
echo 'aps install'
|
echo 'aps install'
|
||||||
echo
|
echo
|
||||||
|
@ -132,9 +132,6 @@ help(){ # --- displays help
|
||||||
echo 'aps upgrade'
|
echo 'aps upgrade'
|
||||||
echo
|
echo
|
||||||
}
|
}
|
||||||
local_installed_list(){ # --- local installed list
|
|
||||||
ls ${installed_pkg_database}
|
|
||||||
}
|
|
||||||
main() { # --- does soem stuff
|
main() { # --- does soem stuff
|
||||||
if [ -f "${lock}" ]; then
|
if [ -f "${lock}" ]; then
|
||||||
echo "[E] A lock file already exists. If you're sure no package manager is running, remove the file ${lock}."
|
echo "[E] A lock file already exists. If you're sure no package manager is running, remove the file ${lock}."
|
||||||
|
@ -149,8 +146,7 @@ main() { # --- does soem stuff
|
||||||
[ -z "${2}" ] && die "[*] No targets specified."
|
[ -z "${2}" ] && die "[*] No targets specified."
|
||||||
install_package_from_repo "official" "${2}" ;;
|
install_package_from_repo "official" "${2}" ;;
|
||||||
upgrade) upgrade "official" ;;
|
upgrade) upgrade "official" ;;
|
||||||
help) help ;;
|
help) help ;;
|
||||||
list) local_installed_list ;;
|
|
||||||
*) die "[E] Invalid option ${1}, exiting..." ;;
|
*) die "[E] Invalid option ${1}, exiting..." ;;
|
||||||
esac
|
esac
|
||||||
rm "${lock}"
|
rm "${lock}"
|
||||||
|
|
Loading…
Reference in a new issue