1.1 --- a/tools/install.sh Tue Jan 31 16:18:55 2017 +0100
1.2 +++ b/tools/install.sh Sun Feb 05 22:16:24 2017 +0100
1.3 @@ -44,6 +44,8 @@
1.4 cp $AGENTS "$INSTALL_DIR"
1.5 cp $MODULES "$INSTALL_DIR"
1.6
1.7 +# Package modules.
1.8 +
1.9 for DIR in "$INSTALL_DIR/imiptools" \
1.10 "$INSTALL_DIR/imiptools/stores" \
1.11 "$INSTALL_DIR/imiptools/stores/database" \
1.12 @@ -54,7 +56,8 @@
1.13 fi
1.14 done
1.15
1.16 -# Remove any symbolic link to the config module.
1.17 +# Remove any symbolic link to the config module. This linking is no longer
1.18 +# supported, anyway.
1.19
1.20 if [ -h "$INSTALL_DIR/imiptools/config.py" ]; then
1.21 rm "$INSTALL_DIR/imiptools/config.py"
1.22 @@ -138,8 +141,9 @@
1.23 # Tools
1.24
1.25 TOOLS="copy_store.py fix.sh init.sh init_user.sh make_freebusy.py set_delegates.py "\
1.26 -"set_quota_groups.py set_quota_limits.py update_quotas.py update_scheduling_modules.py "\
1.27 -"update_storage_modules.py"
1.28 +"set_quota_groups.py set_quota_limits.py update_quotas.py"
1.29 +
1.30 +OLD_TOOLS="update_scheduling_modules.py update_storage_modules.py"
1.31
1.32 if [ ! -e "$INSTALL_DIR/tools" ]; then
1.33 mkdir -p "$INSTALL_DIR/tools"
1.34 @@ -149,6 +153,12 @@
1.35 cp "tools/$TOOL" "$INSTALL_DIR/tools/"
1.36 done
1.37
1.38 +for TOOL in $OLD_TOOLS; do
1.39 + if [ -e "$INSTALL_DIR/tools/$TOOL" ]; then
1.40 + rm "$INSTALL_DIR/tools/$TOOL"
1.41 + fi
1.42 +done
1.43 +
1.44 # Web manager interface.
1.45
1.46 if [ ! -e "$WEB_INSTALL_DIR" ]; then
1.47 @@ -183,11 +193,3 @@
1.48 done
1.49 fi
1.50 fi
1.51 -
1.52 -# Run the scheduling module update tool to regenerate the manifest module.
1.53 -
1.54 -PYTHONPATH="$INSTALL_DIR" "$INSTALL_DIR/tools/update_scheduling_modules.py"
1.55 -
1.56 -# Run the storage module update tool to regenerate the manifest module.
1.57 -
1.58 -PYTHONPATH="$INSTALL_DIR" "$INSTALL_DIR/tools/update_storage_modules.py"