From 8cb69c3aa2409f992b138511c1c3b9774ff008b2 Mon Sep 17 00:00:00 2001 From: Seppia Date: Sun, 3 Jun 2018 14:40:29 +0200 Subject: Diff support Upgrade function diff view support and removed sources update from install function. --- repo.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/repo.sh b/repo.sh index 8edf35e..6f6af11 100755 --- a/repo.sh +++ b/repo.sh @@ -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.' -- cgit v1.2.3