[packages] transmission: correct quoting of parameters
authorCezary Jackiewicz <cezary@eko.one.pl>
Tue, 16 Feb 2010 16:59:07 +0000 (16:59 +0000)
committerCezary Jackiewicz <cezary@eko.one.pl>
Tue, 16 Feb 2010 16:59:07 +0000 (16:59 +0000)
SVN-Revision: 19661

net/transmission/Makefile
net/transmission/files/transmission.init

index fdf69ee8d2da799c428609acae968386a24adfd8..2683ffcb8270de27a32d24779d9096c3eaf05b15 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=transmission
 PKG_VERSION:=1.83
 
 PKG_NAME:=transmission
 PKG_VERSION:=1.83
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files
index cdc9ce36009b3f6ee602c345a57c7dbcfc4429c4..5013dde3fb9b30551f7b770b105f355d3ca9f35a 100644 (file)
@@ -13,7 +13,7 @@ append_params() {
                IFS="$LIST_SEP"
                for v in $v; do
                        [ -n "$v" ] && (
                IFS="$LIST_SEP"
                for v in $v; do
                        [ -n "$v" ] && (
-                               echo "          \""$p"\": "$v"," | sed -e 's|_|-|g' >> $config_dir/settings.json
+                               echo "\""$p"\": "$v"," | sed -e 's|_|-|g' >> $config_dir/settings.json
                        )
                done
                unset IFS
                        )
                done
                unset IFS
@@ -27,7 +27,7 @@ append_params_quotes() {
                IFS="$LIST_SEP"
                for v in $v; do
                        [ -n "$v" ] && (
                IFS="$LIST_SEP"
                for v in $v; do
                        [ -n "$v" ] && (
-                               echo "          \""$p"\": \""$v"\"," | sed -e 's|/|\\/|g;s|_|-|g' >> $config_dir/settings.json
+                               echo "\""$p"\": \""$v"\"," | sed -e 's|/|\\/|g;s|_|-|g' >> $config_dir/settings.json
                        )
                done
                unset IFS
                        )
                done
                unset IFS
@@ -48,8 +48,8 @@ start_service() {
 
        append_params "$s" \
                alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \
 
        append_params "$s" \
                alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \
-               alt_speed_time_enabled alt_speed_time_end alt_speed_up bind_address_ipv4 \
-               bind_address_ipv6 blocklist_enabled dht_enabled encryption \
+               alt_speed_time_enabled alt_speed_time_end alt_speed_up \
+               blocklist_enabled dht_enabled encryption \
                incomplete_dir_enabled lazy_bitfield_enabled message_level \
                open_file_limit peer_limit_global peer_limit_per_torrent peer_port \
                peer_port_random_high peer_port_random_low peer_port_random_on_start \
                incomplete_dir_enabled lazy_bitfield_enabled message_level \
                open_file_limit peer_limit_global peer_limit_per_torrent peer_port \
                peer_port_random_high peer_port_random_low peer_port_random_on_start \
@@ -58,13 +58,14 @@ start_service() {
                ratio_limit_enabled rename_partial_files rpc_authentication_required \
                rpc_enabled rpc_port rpc_whitelist_enabled speed_limit_down \
                speed_limit_down_enabled speed_limit_up speed_limit_up_enabled umask \
                ratio_limit_enabled rename_partial_files rpc_authentication_required \
                rpc_enabled rpc_port rpc_whitelist_enabled speed_limit_down \
                speed_limit_down_enabled speed_limit_up speed_limit_up_enabled umask \
-               upload_slots_per_torrent watch_dir watch_dir_enabled
+               upload_slots_per_torrent watch_dir_enabled
 
        append_params_quotes "$s" \
 
        append_params_quotes "$s" \
-               download_dir incomplete_dir proxy proxy_auth_password proxy_auth_username \
-               rpc_bind_address rpc_password rpc_username rpc_whitelist
+               bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir proxy \
+               proxy_auth_password proxy_auth_username \
+               rpc_bind_address rpc_password rpc_username rpc_whitelist watch_dir
 
 
-       echo "          \""invalid-key"\": false" >> $config_dir/settings.json
+       echo "\""invalid-key"\": false" >> $config_dir/settings.json
        echo "}" >> $config_dir/settings.json
        
        eval "$SSD -q -b -x $BIN -S -- -g $config_dir"
        echo "}" >> $config_dir/settings.json
        
        eval "$SSD -q -b -x $BIN -S -- -g $config_dir"