summaryrefslogtreecommitdiffstats
path: root/contrib/pacdiff
diff options
context:
space:
mode:
authorNezmer <git@nezmer.info>2010-10-12 00:20:57 +0300
committerDan McGee <dan@archlinux.org>2010-10-11 20:29:22 -0500
commitbce3c8efc7a2d187984aa0e7037307b99c217fd7 (patch)
tree8eb9ead2af2a61ad0764b08e804d8471b975ce01 /contrib/pacdiff
parent7d937772313a796f4c0bff76bf1bd7d78f8ccb5a (diff)
downloadpacman-bce3c8efc7a2d187984aa0e7037307b99c217fd7.tar.xz
Add .in extension to files in contrib
This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git@nezmer.info> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'contrib/pacdiff')
-rwxr-xr-xcontrib/pacdiff80
1 files changed, 0 insertions, 80 deletions
diff --git a/contrib/pacdiff b/contrib/pacdiff
deleted file mode 100755
index 3f26f381..00000000
--- a/contrib/pacdiff
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# pacdiff : a simple pacnew/pacorig/pacsave updater
-#
-# Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-diffprog=${DIFFPROG:-vimdiff}
-diffsearchpath=${DIFFSEARCHPATH:-/etc}
-locate=0
-
-usage() {
- echo "pacdiff : a simple pacnew/pacorig/pacsave updater"
- echo "Usage : pacdiff [-l]"
- echo " -l/--locate makes pacdiff use locate rather than find"
- echo " DIFFPROG variable allows to override the default vimdiff"
- echo " DIFFSEARCHPATH allows to override the default /etc path"
- echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" pacdiff"
-}
-
-cmd() {
- if [ $locate -eq 1 ]; then
- locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave
- else
- find $diffsearchpath \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave \) -print0
- fi
-}
-
-if [ $# -gt 0 ]; then
- case $1 in
- -l|--locate)
- locate=1;;
- *)
- usage; exit 0;;
- esac
-fi
-
-# see http://mywiki.wooledge.org/BashFAQ/020
-while IFS= read -u 3 -r -d '' pacfile; do
- file="${pacfile%.pac*}"
- echo "File: $file"
- if [ ! -f "$file" ]; then
- echo " $file does not exist"
- rm -i "$pacfile"
- continue
- fi
- check="$(cmp "$pacfile" "$file")"
- if [ -z "${check}" ]; then
- echo " Files are identical, removing..."
- rm "$pacfile"
- else
- echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] "
- while read c; do
- case $c in
- r|R) rm "$pacfile"; break ;;
- v|V)
- $diffprog "$pacfile" "$file"
- rm -i "$pacfile"; break ;;
- s|S) break ;;
- *) echo -n " Invalid answer. Try again: [v/s/r] "; continue ;;
- esac
- done
- fi
-done 3< <(cmd)
-
-exit 0
-
-# vim: set ts=2 sw=2 noet: