Merge pull request #2631 from nayasis/main

let shader filter configurable
JustEnoughLinuxOS · Jan 4, 2024 · 956a295 · 956a295
2 parents 9b656a3 + 7d05860
commit 956a295
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 7 deletions.
diff --git a/packages/hardware/quirks/platforms/AMD64/091-ui_shader b/packages/hardware/quirks/platforms/AMD64/091-ui_shader
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/091-ui_shader
+UI_SHADER="slangp"
+EOF
diff --git a/packages/hardware/quirks/platforms/RK3326/091-ui_shader b/packages/hardware/quirks/platforms/RK3326/091-ui_shader
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/091-ui_shader
+UI_SHADER="slangp"
+EOF
diff --git a/packages/hardware/quirks/platforms/RK3399/091-ui_shader b/packages/hardware/quirks/platforms/RK3399/091-ui_shader
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/091-ui_shader
+UI_SHADER="slangp"
+EOF
diff --git a/packages/hardware/quirks/platforms/RK3566/091-ui_shader b/packages/hardware/quirks/platforms/RK3566/091-ui_shader
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/091-ui_shader
+UI_SHADER="glslp"
+EOF
diff --git a/packages/hardware/quirks/platforms/RK3588/091-ui_shader b/packages/hardware/quirks/platforms/RK3588/091-ui_shader
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/091-ui_shader
+UI_SHADER="slangp"
+EOF
diff --git a/packages/hardware/quirks/platforms/S922X/091-ui_shader b/packages/hardware/quirks/platforms/S922X/091-ui_shader
@@ -0,0 +1,8 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/091-ui_shader
+UI_SHADER="glslp"
+EOF
diff --git a/packages/jelos/sources/scripts/getshaders b/packages/jelos/sources/scripts/getshaders
@@ -6,18 +6,16 @@
 # Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert)
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
-if [[ "${UI_SERVICE}" =~ ^weston ]]
-then
-  SHADERS='*.slang*'
+if [ -z "$UI_SHADER" ]; then
+  option=".*\.\(glslp\|slangp\)$"
 else
-  SHADERS='*.glslp*'
+  option=".*\.\($UI_SHADER\)$"
 fi
 
 for dir in /tmp/shaders
 do
-  if [ -d "${dir}" ]
-  then
-    find ${dir} -name ${SHADERS} -print0 |
+  if [ -d "${dir}" ]; then
+    find ${dir} -regex "${option}" -print0 |
       while IFS= read -r -d '' line; do
       echo ${line#${dir}/},
     done