Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-05-15 15:21:10 +02:00
commit bcdf335109
6 changed files with 16 additions and 7 deletions

View File

@ -1,5 +1,6 @@
2.1.3
- update to transmission-2.51
- added option to specify download directory
2.1.2
- update to addon version 2.1

View File

@ -44,17 +44,17 @@ cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/co
. /var/config/transmission.conf.default
. /var/config/transmission.conf
mkdir -p /storage/downloads
mkdir -p /storage/downloads/incoming
mkdir -p /storage/downloads/watch
mkdir -p "$TRANSMISSION_DL_DIR"
mkdir -p "$TRANSMISSION_DL_DIR/incoming"
mkdir -p "$TRANSMISSION_DL_DIR/watch"
if [ -z "$TRANSMISSION_IP" ]; then
TRANSMISSION_IP="*.*.*.*"
fi
TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads"
TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming"
TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
TRANSMISSION_ARG="$TRANSMISSION_ARG -w \"$TRANSMISSION_DL_DIR\""
TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir \"$TRANSMISSION_DL_DIR/incoming\""
TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir \"$TRANSMISSION_DL_DIR/watch\""
TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"

View File

@ -14,4 +14,7 @@
<string id="3021">Overall peer limit.</string>
<string id="3022">Peer limit per torrent</string>
<string id="3110">Other</string>
<string id="3121">Download Directory</string>
</strings>

View File

@ -17,5 +17,9 @@
<setting type="sep" />
<setting id="TRANSMISSION_LIMIT_GLOBAL" type="number" label="3021" value="" default="" />
<setting id="TRANSMISSION_LIMIT_TORRENT" type="number" label="3022" value="" default="" />
<setting type="sep" />
<setting label="3110" type="lsep"/>
<setting id="TRANSMISSION_DL_DIR" type="folder" label="3121" value="" default="/storage/downloads" />
</category>
</settings>

View File

@ -5,4 +5,5 @@
<setting id="TRANSMISSION_USER" value="openelec" />
<setting id="TRANSMISSION_LIMIT_GLOBAL" value="" />
<setting id="TRANSMISSION_LIMIT_TORRENT" value="" />
<setting id="TRANSMISSION_DL_DIR" value="/storage/downloads" />
</settings>

View File

@ -319,7 +319,7 @@ NBD_DEVS="0"
for module in $(cat /etc/modules); do
progress "Loading kernel module $module"
/bin/busybox insmod "$MODULE_DIR/$module.ko" || \
error "load_modules" "Failed to load kernel module $module"
progress "... Failed to load kernel module $module, skipping"
done
}