mirror of
https://gitlab.futo.org/videostreaming/grayjay.git
synced 2025-05-02 15:44:26 +02:00
Merge
This commit is contained in:
commit
2cd01eb1fe
@ -6,6 +6,7 @@ import java.io.ByteArrayOutputStream
|
|||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.io.InputStream
|
import java.io.InputStream
|
||||||
import java.net.Inet4Address
|
import java.net.Inet4Address
|
||||||
|
import java.net.Inet6Address
|
||||||
import java.net.InetAddress
|
import java.net.InetAddress
|
||||||
import java.net.InetSocketAddress
|
import java.net.InetSocketAddress
|
||||||
import java.net.Socket
|
import java.net.Socket
|
||||||
|
@ -33,10 +33,10 @@ fun Boolean?.toYesNo(): String {
|
|||||||
fun InetAddress?.toUrlAddress(): String {
|
fun InetAddress?.toUrlAddress(): String {
|
||||||
return when (this) {
|
return when (this) {
|
||||||
is Inet6Address -> {
|
is Inet6Address -> {
|
||||||
"[${toString()}]"
|
"[${hostAddress}]"
|
||||||
}
|
}
|
||||||
is Inet4Address -> {
|
is Inet4Address -> {
|
||||||
toString()
|
hostAddress
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
throw Exception("Invalid address type")
|
throw Exception("Invalid address type")
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit de038eb865d1b0f4b5dfa2277214ff3c16e75cd8
|
Subproject commit 3ee5b7f40dd9caf10112bfcad86c91c39c8e08c5
|
@ -6,8 +6,8 @@ sign_scripts() {
|
|||||||
local plugin_dir=$1
|
local plugin_dir=$1
|
||||||
|
|
||||||
if [[ -d "$plugin_dir" ]]; then
|
if [[ -d "$plugin_dir" ]]; then
|
||||||
script_file=$(find "$plugin_dir" -maxdepth 2 -name '*Script.js')
|
script_file=$(find "$plugin_dir" -maxdepth 2 -name '*Script.js' | head -n 1)
|
||||||
config_file=$(find "$plugin_dir" -maxdepth 2 -name '*Config.json')
|
config_file=$(find "$plugin_dir" -maxdepth 2 -name '*Config.json' | head -n 1)
|
||||||
sign_script="$plugin_dir/sign.sh"
|
sign_script="$plugin_dir/sign.sh"
|
||||||
|
|
||||||
if [[ -f "$sign_script" && -n "$script_file" && -n "$config_file" ]]; then
|
if [[ -f "$sign_script" && -n "$script_file" && -n "$config_file" ]]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user