Switch to unified view

a/src/makestaticdist.sh b/src/makestaticdist.sh
...
...
38
else 
38
else 
39
    echo "Removing everything under $topdir Ok ? (y/n)"
39
    echo "Removing everything under $topdir Ok ? (y/n)"
40
    read rep 
40
    read rep 
41
    if test $rep = 'y';then
41
    if test $rep = 'y';then
42
        rm -rf $topdir/*
42
        rm -rf $topdir/*
43
    else
44
  exit 1
43
    fi
45
    fi
44
fi
46
fi
45
47
46
rm -f index/recollindex ${QTGUI}/recoll
48
rm -f index/recollindex ${QTGUI}/recoll
47
49
...
...
56
desktop/recoll.png desktop/recoll-searchgui.desktop"
58
desktop/recoll.png desktop/recoll-searchgui.desktop"
57
59
58
$TAR chf - $files  | (cd $topdir; $TAR xf -)
60
$TAR chf - $files  | (cd $topdir; $TAR xf -)
59
61
60
# Remove any install dependancy
62
# Remove any install dependancy
61
chmod +w $topdir/Makefile
63
chmod +w $topdir/Makefile || exit 1
62
sed -e '/^install:/c\
64
sed -e '/^install:/c\
63
install: ' < $topdir/Makefile > $topdir/toto && \
65
install: ' < $topdir/Makefile > $topdir/toto && \
64
     mv $topdir/toto $topdir/Makefile
66
     mv $topdir/toto $topdir/Makefile
65
67
68
# Clean up .svn directories from target. This would be easier with a
69
# --exclude tar option, but we want this to work with non-gnu tars
70
cd $topdir || exit 1
71
svndirs=`find . -name .svn -print`
72
echo "In: `pwd`. Removing $svndirs ok ?"
73
read rep 
74
test "$rep" = 'y' -o "$rep" = 'Y' && rm -rf $svndirs
75
76
cd $targetdir
66
77
67
(cd $targetdir ; \
78
(cd $targetdir ; \
68
    $TAR chf - $topdirsimple | \
79
    $TAR chf - $topdirsimple | \
69
        gzip > $tarfile)
80
        gzip > $tarfile)
70
81