From 0cb2b59f6d27e0ec18eaced7424bbb99a8c75737 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Mon, 29 Dec 2014 19:41:18 +0100
Subject: [PATCH] cosmetics
---
scripts/mhwd-gpu | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/scripts/mhwd-gpu b/scripts/mhwd-gpu
index a0ede43..425962d 100755
--- a/scripts/mhwd-gpu
+++ b/scripts/mhwd-gpu
@@ -33,10 +33,10 @@ set_modules() {
echo "## Generated by mhwd - Manjaro Hardware Detection" >> "/etc/modprobe.d/mhwd-gpu.conf"
echo "##" >> "/etc/modprobe.d/mhwd-gpu.conf"
echo " " >> "/etc/modprobe.d/mhwd-gpu.conf"
+
for module in $2
do
echo "blacklist ${module}" >> "/etc/modprobe.d/mhwd-gpu.conf"
-
# Unload module if X is not running
if [ ! "$(pgrep X)" ]; then
rmmod -f ${module}
@@ -47,10 +47,10 @@ set_modules() {
echo "## Generated by mhwd - Manjaro Hardware Detection" >> "${MODULES_LOAD}/mhwd-gpu.conf"
echo "##" >> "${MODULES_LOAD}/mhwd-gpu.conf"
echo " " >> "${MODULES_LOAD}/mhwd-gpu.conf"
+
for module in $1
do
echo "${module}" >> "${MODULES_LOAD}/mhwd-gpu.conf"
-
# Load module if X is not running
if [ ! "$(pgrep X)" ]; then
modprobe ${module}
@@ -67,7 +67,6 @@ set_xorg()
if [ -e "$1" ]; then
ln -sf "$1" "${MHWDXORGCONF}"
-
echo "xorg configuration file: '$1'"
else
echo "warning: could not find '$1'!"
@@ -88,7 +87,6 @@ set_Gl() {
ln -sf "$1" /usr/lib/libGL.so
ln -sf "$1" /usr/lib/libGL.so.1
ln -sf "$1" /usr/lib/libGL.so.1.2.0
-
echo "libGl: '$1'"
else
echo "warning: could not find '$1'!"
@@ -98,7 +96,6 @@ set_Gl() {
ln -sf "$2" /usr/lib/libGLESv1_CM.so
ln -sf "$2" /usr/lib/libGLESv1_CM.so.1
ln -sf "$2" /usr/lib/libGLESv1_CM.so.1.1.0
-
echo "libGLESv1: '$2'"
else
echo "warning: could not find '$2'!"
@@ -108,7 +105,6 @@ set_Gl() {
ln -sf "$3" /usr/lib/libGLESv2.so
ln -sf "$3" /usr/lib/libGLESv2.so.2
ln -sf "$3" /usr/lib/libGLESv2.so.2.0.0
-
echo "libGLESv2: '$3'"
else
echo "warning: could not find '$3'!"
@@ -118,7 +114,6 @@ set_Gl() {
ln -sf "$4" /usr/lib/libEGL.so
ln -sf "$4" /usr/lib/libEGL.so.1
ln -sf "$4" /usr/lib/libEGL.so.1.0.0
-
echo "libEGL: '$4'"
else
echo "warning: could not find '$4'!"
@@ -130,7 +125,6 @@ set_Gl() {
ln -sf "$6" /usr/lib32/libGL.so
ln -sf "$6" /usr/lib32/libGL.so.1
ln -sf "$6" /usr/lib32/libGL.so.1.2.0
-
echo "lib32-libGl: '$6'"
fi
@@ -138,7 +132,6 @@ set_Gl() {
ln -sf "$7" /usr/lib32/libGLESv1_CM.so
ln -sf "$7" /usr/lib32/libGLESv1_CM.so.1
ln -sf "$7" /usr/lib32/libGLESv1_CM.so.1.1.0
-
echo "lib32-libGLESv1: '$7'"
fi
@@ -146,7 +139,6 @@ set_Gl() {
ln -sf "$8" /usr/lib32/libGLESv2.so
ln -sf "$8" /usr/lib32/libGLESv2.so.2
ln -sf "$8" /usr/lib32/libGLESv2.so.2.0.0
-
echo "lib32-libGLESv2: '$8'"
fi
@@ -154,7 +146,6 @@ set_Gl() {
ln -sf "$9" /usr/lib32/libEGL.so
ln -sf "$9" /usr/lib32/libEGL.so.1
ln -sf "$9" /usr/lib32/libEGL.so.1.0.0
-
echo "lib32-libEGL: '$9'"
fi
@@ -162,7 +153,6 @@ set_Gl() {
if [ -e "$5" ]; then
ln -sf "$5" /usr/lib/xorg/modules/extensions/libglx.so
-
echo "libglx: '$5'"
else
echo "warning: could not find '$5'!"
@@ -188,12 +178,14 @@ print_link_destination_if_exists()
print_status()
{
echo ":: status"
+
if [ "${MHWD64_IS_LIB32}" == "true" ];then
print_link_destination_if_exists "/usr/lib32/libGL.so" " lib32-libGl:"
print_link_destination_if_exists "/usr/lib32/libGLESv1_CM.so" " lib32-libGLESv1:"
print_link_destination_if_exists "/usr/lib32/libGLESv2.so" " lib32-libGLESv2:"
print_link_destination_if_exists "/usr/lib32/libEGL.so" " lib32-libEGL:"
fi
+
print_link_destination_if_exists "/usr/lib/libGL.so" " libGl:"
print_link_destination_if_exists "/usr/lib/libGLESv1_CM.so" " libGLESv1:"
print_link_destination_if_exists "/usr/lib/libGLESv2.so" " libGLESv2:"
@@ -211,9 +203,11 @@ print_help()
echo " --check check for invalid symlinks and repair"
echo " --setgl [mesa/nvidia/catalyst] set libgl and libglx"
echo " --setxorg [PATH] set xorg configuration file"
+
if [ "${ARCH}" == "x86_64" ];then
echo " --setlib32 [true/false] set lib32 support"
fi
+
echo ""
}
--
GitLab