X-Git-Url: https://git.ao2.it/etcdiff.git/blobdiff_plain/a7236076378cfbd9c0411284820bc951f73035c8..HEAD:/etcdiff.sh

diff --git a/etcdiff.sh b/etcdiff.sh
index ea0de33..45587cb 100755
--- a/etcdiff.sh
+++ b/etcdiff.sh
@@ -1,117 +1,73 @@
 #!/bin/sh
 #
-# Version 0.2
-#
 # etcdiff (deb-etcdiff?) shows how your current /etc dir
-# diverges from the debian distribution standard one.
+# diverges from the debian default one.
 #
-# Copyright (C) 2008,2009 Antonio Ospite <ospite@studenti.unina.it>
+# Copyright (C) 2008,2009,2010 Antonio Ospite <ospite@studenti.unina.it>
 # License: GPLv2 or later
-
-
-# TODO:
-#   Add per package etcdiff, using dpkg -L
-#   Add per distro etcdiff using dpkg --get-selections
 #
-# Note that the first method can't consider files not in original packages,
-# unless some smart trick is used (new files could be in same /etc subdir of
-# the provided configuration files)
-#
-# The second one could even speedup the whole etcdiffing by recreating an etc
-# dir as per packages defaults, and do one big diff.
-
-set -x
+#set -x
+#set -e
 
 #PROMPT_RM=-i
 
 DEBIANMIRROR="http://ftp.it.debian.org/debian"
 
-rm $PROMPT_RM -rf temp     && mkdir temp
-rm $PROMPT_RM -rf archives && mkdir archives
-rm $PROMPT_RM -rf conf     && mkdir conf
-
-# Examples of file query
-
-# by list
-#FILES="/etc/sysctl.conf /etc/init.d/procps /etc/passwd-"
-
-# by command
-FILES=$(find /etc/apache2 -type f $USERMODE | grep -v '.dpkg-')
-
-# by command, public files, limited
-#USERMODE="-perm /o+r"
-#MAXDEPTH="-maxdepth 1"
-#FILES=$(find /etc/ $MAXDEPTH -type f $USERMODE | grep -v '.dpkg-')
-
-# by package name
-#FILES=$(dpkg -L apache2.2-common | grep '^/etc')
-
-for file in ${FILES};
-do
-  if [ ! -e $file ];
-  then
-    echo "ERROR, file $file does not exist."
-    exit 1;
-  fi
-  echo "-> $file"
-
-  # Find out which 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
-    DESTDIR=`dirname $file`
-    # strip trailing slash
-    [ ${DESTDIR:0:1} == '/' ] && DESTDIR=${DESTDIR:1}
-
-    # RECREATE the destination dir 
-    [ -d conf/$DESTDIR ] || mkdir -p conf/$DESTDIR
-    cp "$file" conf/$DESTDIR
-
-    continue
-  fi
-
-  # Get the package from the repository and diff
-
-  FILENAME=$(apt-cache show $PACKAGE | grep ^Filename | cut -d ' ' -f 2-)
-  ARCHIVE=$(basename $FILENAME)
-
-  if [ ! -f archives/$ARCHIVE ];
-  then
-    ( cd archives &&
-        wget -q -nc -c $DEBIANMIRROR/$FILENAME &&
-        mkdir ../temp/$PACKAGE
-        dpkg -x $ARCHIVE ../temp/$PACKAGE
-    )
-  fi
-
-  # Check for file existence before diffing, the file is not provided in
-  # package archive, but it could have been generated by package installation
-  # scripts
-  if [ ! -f temp/$PACKAGE/$file ];
-  then
-    echo "Warning: '$file' can't be found in package!"
-  fi
-
-
-  # TODO: diff only once and check filesize
-  TMPDIFF_FILE=`mktemp /tmp/etcdiff.XXXXXXXXXX`
-  diff -u temp/$PACKAGE/$file $file > $TMPDIFF_FILE
-  if [ `stat -c '%s' $TMPDIFF_FILE` -eq 0 ];
-  then
-    echo "$file: not changed"
-    rm -f $TMPDIFF_FILE
-  else
-    DESTDIR=`dirname $file`
-    # strip trailing slash
-    [ ${DESTDIR:0:1} == '/' ] && DESTDIR=${DESTDIR:1}
-
-    # RECREATE the destination dir 
-    [ -d conf/$DESTDIR ] || mkdir -p conf/$DESTDIR
-    cp $TMPDIFF_FILE conf/$DESTDIR/$(basename $file).patch
-
-    rm -f $TMPDIFF_FILE
-  fi
-
-done
+BASEDIR=$(dirname $0)
+TEMPDIR=${BASEDIR}/temp
+CACHEDIR=${BASEDIR}/cache
+REPORTDIR=${BASEDIR}/reports
+
+usage()
+{
+  echo "usage: $0 <file|package|system> [<file name>|<package name>]
+
+etcdiff shows how your /etc dir differs from the debian default one
+
+etcdiff by explicit file list:
+    FILES='/etc/sysctl.conf /etc/updatedb.conf'
+    for file in \$FILES;
+    do
+      $0 file \$file
+    done
+
+etcdiff bycommand generated file list
+    FILES=\$(find /etc/apache2 -type f -perm /o+r | grep -v '.dpkg-')
+    for file in \$FILES;
+    do
+      $0 file \$file
+    done
+
+etcdiff by package name
+    $0 package cherokee
+    $0 package mlocate
+    $0 package apache2-doc
+    $0 package apache2.2-common
+    $0 package libapache2-mod-php5
+    $0 package hostapd
+
+etcdiff the whole /etc system directory
+    $0 system
+"
+}
+
+rm -rf $PROMPT_RM $TEMPDIR   && mkdir $TEMPDIR
+rm -rf $PROMPT_RM $CACHEDIR  && mkdir $CACHEDIR
+rm -rf $PROMPT_RM $REPORTDIR && mkdir $REPORTDIR
+
+. $BASEDIR/etcdiff.include
+
+case $1 in
+  file)
+    etcdiff_by_file $2
+    ;;
+  package)
+    etcdiff_by_package $2
+    ;;
+  system)
+    etcdiff_system
+    ;;
+  *)
+    usage
+    ;;
+esac