Reimplementation.

[etcdiff.git] / etcdiff.sh

diff --git a/etcdiff.sh b/etcdiff.sh
index b8a3be6..3014c4b 100755 (executable)
--- a/etcdiff.sh
+++ b/etcdiff.sh
@@ -3,53 +3,49 @@
 # etcdiff (deb-etcdiff?) shows how your current /etc dir
 # diverges from the debian distribution standard one.
 #
-# Copyright (C) 2008 Antonio Ospite <ospite@studenti.unina.it>
+# Copyright (C) 2008,2009,2010 Antonio Ospite <ospite@studenti.unina.it>
 # License: GPLv2 or later
-
-set -ex
+#
+#set -x
+#set -e
 
 PROMPT_RM=-i
 
 DEBIANMIRROR="http://ftp.it.debian.org/debian"
 
-rm $PROMPT_RM -r temp     && mkdir temp
-rm $PROMPT_RM -r archives && mkdir archives
-rm $PROMPT_RM -r conf     && mkdir -p conf/patches
-
-USERMODE="-perm /o+r"
-MAXDEPTH="-maxdepth 1"
-
-#FILES="/etc/sysctl.conf /etc/init.d/procps /etc/passwd-"
-FILES=$(find /etc/ $MAXDEPTH -type f $USERMODE | grep -v '.dpkg-')
-
-for file in ${FILES};
-do
-  echo "-> $file"
-
-  # Find out what installed package provides the config file
-  PACKAGE=$(dpkg-query -S "$file" | cut -d ':' -f 1 | uniq 2> /dev/null)
-
-  # Copy the whole file if it is not provided by default
-  if [ "x$PACKAGE" == "x" ];
-  then
-    cp "$file" conf/
-    continue
-  fi
-
-  # Get the package from the repository and diff
-
-  FILENAME=$(apt-cache show $PACKAGE | grep ^Filename | cut -d ' ' -f 2-)
-  ARCHIVE=$(basename $FILENAME)
-
-  (cd archives && wget -q -nc -c $DEBIANMIRROR/$FILENAME)
-  dpkg -x archives/$ARCHIVE temp/
-
-  diff -q temp/$file $file > /dev/null
-  if [ $? -eq 1 ];
-  then
-    diff -u temp/$file $file > conf/patches/$(basename $file).patch
-  else
-    echo "$file: not changed"
-  fi
-
-done
+BASEDIR=$(dirname $0)
+TEMPDIR=${BASEDIR}/temp
+CACHEDIR=${BASEDIR}/cache
+REPORTDIR=${BASEDIR}/reports
+
+rm $PROMPT_RM -rf $TEMPDIR   && mkdir $TEMPDIR
+rm $PROMPT_RM -rf $CACHEDIR  && mkdir $CACHEDIR
+rm $PROMPT_RM -rf $REPORTDIR && mkdir $REPORTDIR
+
+. $BASEDIR/etcdiff.include
+
+# Examples of file query
+
+# by explicit file list
+#FILES="/etc/sysctl.conf /etc/updatedb.conf"
+#for file in $FILES;
+#do
+#  etcdiff_by_file $file
+#done
+
+# by file list generated by a command
+#FILES=$(find /etc/apache2 -type f -perm /o+r | grep -v '.dpkg-')
+#for file in $FILES;
+#do
+#  etcdiff_by_file $file
+#done
+
+# by package name
+#etcdiff_by_package cherokee
+#etcdiff_by_package mlocate
+#etcdiff_by_package apache2-doc
+#etcdiff_by_package apache2.2-common
+#etcdiff_by_package libapache2-mod-php5
+#etcdiff_by_package hostapd
+
+#etchdiff_system