From f1814b3690d61cc122c83381ed013eaf20a33971 Mon Sep 17 00:00:00 2001 From: Wis Date: Mon, 13 Sep 2021 17:17:29 +0300 Subject: [PATCH] mpv: fix error on launch by removing directories inside mpv's scripts directory (#1004) * remove dirs from mpv scripts dir * remove submodule dir from mpv scripts dir * add script_modules directory outside scripts direcoty * load modules/plugins from script_modules, outside mpv's script-files-only directory * rename variable --- .config/mpv/script_modules/mpvSockets | 1 + .config/mpv/scripts/modules.lua | 4 ++-- .config/mpv/scripts/mpvSockets | 1 - .gitmodules | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 .config/mpv/script_modules/mpvSockets delete mode 160000 .config/mpv/scripts/mpvSockets diff --git a/.config/mpv/script_modules/mpvSockets b/.config/mpv/script_modules/mpvSockets new file mode 160000 index 0000000..be9b7ca --- /dev/null +++ b/.config/mpv/script_modules/mpvSockets @@ -0,0 +1 @@ +Subproject commit be9b7ca84456466e54331bab59441ac207659c1c diff --git a/.config/mpv/scripts/modules.lua b/.config/mpv/scripts/modules.lua index 37b69b3..703f372 100644 --- a/.config/mpv/scripts/modules.lua +++ b/.config/mpv/scripts/modules.lua @@ -1,3 +1,3 @@ -local mpv_scripts_dir_path = os.getenv("HOME") .. "/.config/mpv/scripts/" -function load(relative_path) dofile(mpv_scripts_dir_path .. relative_path) end +local mpv_config_dir_path = require("mp").command_native({"expand-path", "~~/"}) +function load(relative_path) dofile(mpv_config_dir_path .. "/script_modules/" .. relative_path) end load("mpvSockets/mpvSockets.lua") diff --git a/.config/mpv/scripts/mpvSockets b/.config/mpv/scripts/mpvSockets deleted file mode 160000 index 8415a08..0000000 --- a/.config/mpv/scripts/mpvSockets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8415a08d99a46213c918613cfe1e088071018db9 diff --git a/.gitmodules b/.gitmodules index 4f7c5dd..c8bf5fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule ".config/mpv/scripts/mpvSockets"] - path = .config/mpv/scripts/mpvSockets +[submodule ".config/mpv/script_modules/mpvSockets"] + path = .config/mpv/script_modules/mpvSockets url = https://github.com/wis/mpvSockets.git