*.sh: Added --force option to python setup.py install call.
upgrade.sh: Removed old cleanup code.
--- a/install.sh Sat Jan 02 19:37:20 2010 +0000
+++ b/install.sh Sat Jan 02 19:56:58 2010 +0000
@@ -26,7 +26,7 @@
exit 1
fi
-python setup.py -q install --prefix ${PREFIX}
+python setup.py -q install --force --prefix ${PREFIX}
python setup.py clean --all >/dev/null
install -b -m 0600 ${INSTALL_OPTS} vmm.cfg ${PREFIX}/etc/
--- a/upgrade.sh Sat Jan 02 19:37:20 2010 +0000
+++ b/upgrade.sh Sat Jan 02 19:56:58 2010 +0000
@@ -43,7 +43,7 @@
exit 1
fi
-python setup.py -q install --prefix ${PREFIX}
+python setup.py -q install --force --prefix ${PREFIX}
python setup.py clean --all >/dev/null
install -m 0700 ${INSTALL_OPTS} vmm ${PREFIX}/sbin
@@ -58,14 +58,6 @@
done
cd - >/dev/null
-# remove misplaced manual pages
-if [ -f /usr/local/share/man/man1/vmm.1 ]; then
- rm -f /usr/local/share/man/man1/vmm.1
-fi
-if [ -f /usr/local/share/man/man5/vmm.cfg.5 ]; then
- rm -f /usr/local/share/man/man5/vmm.cfg.5
-fi
-
# install manual pages
cd man
[ -d ${MANDIR}/man1 ] || mkdir -m 0755 -p ${MANDIR}/man1