diff options
Diffstat (limited to 'repo.sh')
-rwxr-xr-x | repo.sh | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -86,14 +86,18 @@ upgrade_packages() { declare -a pkg=("${!1}") for i in "${pkg[@]}"; do cd $(find ${SRC_PATH}/* -type d -prune -iname "*$i") - git pull + git fetch + git diff origin/master + git merge makepkg -Cs done else for i in $(find ${SRC_PATH}/* -type d -prune) do cd $i - git pull + git fetch + git diff origin/master + git merge makepkg -Cs done fi @@ -104,7 +108,6 @@ install_package() { for i in "${pkg[@]}"; do if [ -d "${SRC_PATH}/$i" ]; then cd $(find ${SRC_PATH}/* -type d -prune -iname "*$i") - git pull makepkg -Csi else echo 'WARNING: Package '"$i"' not found.' |