Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index be5f539396741fac81cbe3f878e870b9cdd98e58..0a836a0b2a0a071e9ceaa194766674f96c731b2b 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,30 +4,11 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.

-firstcompat=0.2
+firstcompat=2.52

 
 

-wikilist=/etc/ikiwiki/wikilist
-
-processline () {
-       user="$1"
-       setup="$2"
-       
-       if [ -z "$user" ] || [ -z "$setup" ]; then
-               echo "parse failure in /etc/ikiwiki/wikilist, line: '$user $setup'" >&2
-               exit 1
-       fi
-       
-       if [ ! -f "$setup" ]; then
-               echo "warning: $setup specified in /etc/ikiwiki/wikilist does not exist, skipping" >&2
-       else
-               echo "Rebuilding $setup as user $user ..."
-               su "$user" -c "ikiwiki -setup $setup"
-       fi
-}
-
-if [ "$1" = configure ] && [ -e $wikilist ] && \
+if [ "$1" = configure ] && \

    dpkg --compare-versions "$2" lt "$firstcompat"; then
    dpkg --compare-versions "$2" lt "$firstcompat"; then

-       grep -v '^#' $wikilist | grep -v '^$' | while read line; do 
-               processline $line
-       done
+       ikiwiki-mass-rebuild
+else
+       ikiwiki-mass-rebuild -refresh -wrappers

 fi
 fi