diff options
| -rwxr-xr-x | auto-void-packages/update-git-repo.sh | 12 | ||||
| -rwxr-xr-x | bin/update-scripts-repo.sh | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/auto-void-packages/update-git-repo.sh b/auto-void-packages/update-git-repo.sh index e71701c..9533bc9 100755 --- a/auto-void-packages/update-git-repo.sh +++ b/auto-void-packages/update-git-repo.sh @@ -5,19 +5,15 @@ echo_n_notify(){ } pushd "$HOME/workbench/void-packages" || exit 1 -CHECKOUT="checkout" -FETCH="fetch" -MERGE="merge" -PUSH="push" git checkout master && \ - echo_n_notify "$CHECKOUT: ok" && \ + echo_n_notify "checkout: ok" && \ git fetch upstream && \ - echo_n_notify "$FETCH: ok" && \ + echo_n_notify "fetch: ok" && \ git merge upstream/master && \ - echo_n_notify "$MERGE: ok" && \ + echo_n_notify "merge: ok" && \ git push && \ - echo_n_notify "$PUSH: ok" + echo_n_notify "push: ok" ./xbps-src bootstrap-update diff --git a/bin/update-scripts-repo.sh b/bin/update-scripts-repo.sh index 03a20ee..be782ab 100755 --- a/bin/update-scripts-repo.sh +++ b/bin/update-scripts-repo.sh @@ -9,7 +9,7 @@ cp -rv "$HOME/.local/usr/local/bin" . cp -rv "$HOME/workbench/auto-void-packages" . cp -rv "$HOME/workbench/ansible" . -git status | less && git diff | less -git add . && git commit && git push -v --progress +git status | less +git add . && git commit -v && git push -v --progress popd || exit 1 |