Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
fonfon 2014-09-09 15:00:30 +02:00
commit f2d8267ef1
2 changed files with 40 additions and 27 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
# Usage:
# module-manager list-available
@ -6,54 +6,64 @@
# module-manager enable <python_root> <module_name>
# module-manager disable <python_root> <module_name>
# associate array with mapping between module names and install paths
# (relative to <python_root>/modules/)
declare -A modules=( ["owncloud"]="installed/apps/owncloud.py" )
# list of modules that may be enabled/disabled
modules="owncloud"
case "$1" in
"list-available")
# TODO: Replace this with something like "aptitude search -F %p plinth-"
echo "${!modules[@]}"
echo "$modules"
;;
"list-enabled")
# TODO: Replace this with something like 'aptitude search -F %p | grep "plinth-"'
for module in "${!modules[@]}"
do
if [ -e "$2"/modules/"$module".py ] ; then
echo "$module"
for module in "$modules"
do
if [ -e "$2"/modules/enabled/"$module" ] ; then
echo "$module"
fi
done
;;
"enable")
# TODO: Replace this with "aptitude install plinth-<module>"
for module in "${!modules[@]}"
for module in "$modules"
do
if [ "$3" == "$module" ] ; then
if [ ! -e "$2"/modules/"$3".py ] ; then
ln -s "$2"/modules/"${modules["$3"]}" "$2"/modules/"$3".py
RETVAL=$?
[ $RETVAL -eq 0 ] && echo "enabled" "$3"
[ $RETVAL -ne 0 ] && echo "failed to enable" "$3"
fi
if [ "$3" = "$module" ] ; then
if [ ! -e "$2"/modules/enabled/"$3" ] ; then
touch "$2"/modules/enabled/"$3"
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
echo "enabled" "$3"
else
echo "failed to enable" "$3"
fi
exit $RETVAL
fi
fi
done
echo "failed to enable invalid module" "$3"
exit 1
;;
"disable")
# TODO: Replace this with "aptitude purge plinth-<module>"
for module in "${!modules[@]}"
for module in "$modules"
do
if [ "$3" == "$module" ] ; then
if [ -e "$2"/modules/"$3".py ] ; then
rm -f "$2"/modules/"$3".py
RETVAL=$?
[ $RETVAL -eq 0 ] && echo "disabled" "$3"
[ $RETVAL -ne 0 ] && echo "failed to disable" "$3"
fi
if [ "$3" = "$module" ] ; then
if [ -e "$2"/modules/enabled/"$3" ] ; then
rm -f "$2"/modules/enabled/"$3"
RETVAL=$?
if [ $RETVAL -eq 0 ] ; then
echo "disabled" "$3"
else
echo "failed to disable" "$3"
fi
exit $RETVAL
fi
fi
done
echo "failed to disable invalid module" "$3"
exit 1
;;
esac

View File

@ -3,6 +3,7 @@ from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.template.response import TemplateResponse
from gettext import gettext as _
import os
from plinth import actions
from plinth import cfg
@ -16,7 +17,9 @@ def get_modules_available():
def get_modules_enabled():
"""Return list of all modules"""
output = actions.run('module-manager', ['list-enabled'])
root = os.path.join(os.path.dirname(__file__), '..', '..')
output = actions.run('module-manager',
['list-enabled', root])
return output.split()