summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeppia <seppia@seppia.net>2018-06-03 14:40:29 +0200
committerSeppia <seppia@seppia.net>2018-06-03 14:40:29 +0200
commit8cb69c3aa2409f992b138511c1c3b9774ff008b2 (patch)
tree5a5d848af49a912fc76c1b9a33a15aa66368cfc5
parentf849f35bdbffe7a22268df08cd906e134a5c5c9a (diff)
downloadrepofish-8cb69c3aa2409f992b138511c1c3b9774ff008b2.tar.gz
repofish-8cb69c3aa2409f992b138511c1c3b9774ff008b2.tar.bz2
repofish-8cb69c3aa2409f992b138511c1c3b9774ff008b2.zip
Diff support
Upgrade function diff view support and removed sources update from install function.
-rwxr-xr-xrepo.sh9
1 files 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.'