diff --git a/conf/settings.json b/conf/settings.json index e4daad9..cdcb4b2 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -50,7 +50,7 @@ "rpc-host-whitelist-enabled": false, "rpc-password": "__RPC_PASSWORD_TO_CHANGE__", "rpc-port": __PORT__, - "rpc-url": "__PATH__/transmission/", + "rpc-url": "__PATH__transmission/", "rpc-username": "transmission", "rpc-whitelist": "127.0.0.1", "rpc-whitelist-enabled": false, diff --git a/scripts/install b/scripts/install index 58d0515..743f9d9 100644 --- a/scripts/install +++ b/scripts/install @@ -120,7 +120,12 @@ ynh_app_setting_set --app=$app --key=rpcpassword --value="$rpcpassword" ynh_replace_string --match_string="__RPC_PASSWORD_TO_CHANGE__" --replace_string="$rpcpassword" --target_file=../conf/settings.json -ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file=../conf/settings.json +if [ "$path_url" != "/" ] +then + ynh_replace_string --match_string="__PATH__" --replace_string="$path_url/" --target_file=../conf/settings.json +else + ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file=../conf/settings.json +fi ynh_replace_string --match_string="__PEER_PORT__" --replace_string="$peer_port" --target_file=../conf/settings.json ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file=../conf/settings.json cp ../conf/settings.json /etc/transmission-daemon/settings.json diff --git a/scripts/upgrade b/scripts/upgrade index 986aa4c..2c4ca9e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,7 +124,12 @@ rpcpassword=$(ynh_string_random) ynh_app_setting_set --app=$app --key=rpcpassword --value="$rpcpassword" ynh_replace_string --match_string="__RPC_PASSWORD_TO_CHANGE__" --replace_string="$rpcpassword" --target_file=../conf/settings.json -ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file=../conf/settings.json +if [ "$path_url" != "/" ] +then + ynh_replace_string --match_string="__PATH__" --replace_string="$path_url/" --target_file=../conf/settings.json +else + ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file=../conf/settings.json +fi ynh_replace_string --match_string="__PEER_PORT__" --replace_string="$peer_port" --target_file=../conf/settings.json ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file=../conf/settings.json cp ../conf/settings.json /etc/transmission-daemon/settings.json