Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Frazier <eyeswide@gmail.com>2013-07-18 18:05:58 -0400
committerAllan McRae <allan@archlinux.org>2013-07-30 13:00:10 +1000
commit0f22bef8c3441fce4cc47618f644e4f818117014 (patch)
treebbdd20eb1ca89252cabb30556545e8e858f6bcfb
parent2d9dad5e14f35657ce4f6e1f59867a0638eca3aa (diff)
pacdiff: provide an --output option to show any .pac* files
This is an option to just echo's the pacnews/pacsaves instead of merging or removing them. This can be used to check the config status such as in a cron job without modifying the system. Signed-off-by: Jonathan Frazier <eyeswide@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/pacdiff.sh.in11
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index d354940d..711763b0 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -27,7 +27,7 @@ diffprog=${DIFFPROG:-vimdiff}
diffsearchpath=${DIFFSEARCHPATH:-/etc}
USE_COLOR='y'
declare -a oldsaves
-declare -i USE_FIND=0 USE_LOCATE=0 USE_PACDB=0
+declare -i USE_FIND=0 USE_LOCATE=0 USE_PACDB=0 OUTPUTONLY=0
m4_include(../scripts/library/output_format.sh)
@@ -43,6 +43,7 @@ Search Options: select one, default: pacmandb
-p/--pacmandb scan active config files from pacman db
General Options:
+ -o/--output print files instead of merging them
--nocolor remove colors from output
Enviroment Variables:
@@ -51,6 +52,7 @@ Enviroment Variables:
(default: /etc)
Example: DIFFPROG=meld DIFFSEARCHPATH="/boot /etc /usr" $myname
+Example: $myname --output --locate
EOF
}
@@ -98,6 +100,8 @@ while [[ -n "$1" ]]; do
USE_FIND=1;;
-p|--pacmandb)
USE_PACDB=1;;
+ -o|--output)
+ OUTPUTONLY=1;;
--nocolor)
USE_COLOR='n';;
-V|--version)
@@ -136,6 +140,11 @@ fi
while IFS= read -u 3 -r -d '' pacfile; do
file="${pacfile%.pac*}"
file_type="pac${pacfile##*.pac}"
+
+ if (( OUTPUTONLY )); then
+ echo "$pacfile"
+ continue
+ fi
# add matches for pacsave.N to oldsaves array, do not prompt
if [[ $file_type = pacsave.+([0-9]) ]]; then