mirror of https://github.com/Chocobozzz/PeerTube
remove eventual trailing '/' at the end of urls in import script (see #1453)pull/1488/head
parent
7f3d712d5e
commit
ab4dbe3657
|
@ -58,6 +58,7 @@ getSettings()
|
|||
settings.remotes[settings.default] :
|
||||
settings.remotes[0]
|
||||
}
|
||||
|
||||
if (!program['username']) program['username'] = netrc.machines[program['url']].login
|
||||
if (!program['password']) program['password'] = netrc.machines[program['url']].password
|
||||
}
|
||||
|
@ -69,6 +70,9 @@ getSettings()
|
|||
process.exit(-1)
|
||||
}
|
||||
|
||||
removeEndSlashes(program['url'])
|
||||
removeEndSlashes(program['targetUrl'])
|
||||
|
||||
const user = {
|
||||
username: program['username'],
|
||||
password: program['password']
|
||||
|
@ -321,3 +325,9 @@ function isNSFW (info: any) {
|
|||
|
||||
return false
|
||||
}
|
||||
|
||||
function removeEndSlashes (url: string) {
|
||||
while (url.endsWith('/')) {
|
||||
url.slice(0, -1)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue