rpms
/
tlp
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: patch should have changed LIBDIRS to LIBDIR, causing a tlp error

Browse Source
epel9
Jeremy 9 years ago
parent aae87d3d9c
commit 1381dcb4d3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File

19
tlp-libdir.patch
Unescape View File

@ -21,14 +21,15 @@
# --- Constants # --- Constants
-readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm" -readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm"
+readonly LIBDIRS="/usr/share/tlp-pm" +readonly LIBDIR="/usr/share/tlp-pm"
readonly LIBS="tlp-functions tlp-rf-func" readonly LIBS="tlp-functions tlp-rf-func"
# --- Locate and source libraries # --- Locate and source libraries
-for libdir in $LIBDIRS; do [ -d $libdir ] && break; done -for libdir in $LIBDIRS; do [ -d $libdir ] && break; done
-if [ ! -d $libdir ]; then -if [ ! -d $libdir ]; then
- echo "Error: missing library directory ($LIBDIRS)." 1>&2
+if [ ! -d $LIBDIR ]; then +if [ ! -d $LIBDIR ]; then
echo "Error: missing library directory ($LIBDIRS)." 1>&2 + echo "Error: missing library directory ($LIBDIR)." 1>&2
exit 1 exit 1
fi fi
@ -62,7 +63,7 @@
# --- Constants # --- Constants
-readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm" -readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm"
+readonly LIBDIRS="/usr/share/tlp-pm" +readonly LIBDIR="/usr/share/tlp-pm"
readonly LIBS="tlp-functions tlp-rf-func" readonly LIBS="tlp-functions tlp-rf-func"
readonly RDW_NM_LOCK="rdw_nm" readonly RDW_NM_LOCK="rdw_nm"
@ -88,7 +89,7 @@
# --- Constants # --- Constants
-readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm" -readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm"
+readonly LIBDIRS="/usr/share/tlp-pm" +readonly LIBDIR="/usr/share/tlp-pm"
readonly LIBS="tlp-functions tlp-rf-func" readonly LIBS="tlp-functions tlp-rf-func"
readonly RDW_DOCK_LOCK="rdw_dock_lock" readonly RDW_DOCK_LOCK="rdw_dock_lock"
@ -137,14 +138,15 @@
# --- Constants # --- Constants
-readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm" -readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm"
+readonly LIBDIRS="/usr/share/tlp-pm" +readonly LIBDIR="/usr/share/tlp-pm"
readonly LIBS="tlp-functions" readonly LIBS="tlp-functions"
# --- Locate and source libraries # --- Locate and source libraries
-for libdir in $LIBDIRS; do [ -d $libdir ] && break; done -for libdir in $LIBDIRS; do [ -d $libdir ] && break; done
-if [ ! -d $libdir ]; then -if [ ! -d $libdir ]; then
- echo "Error: missing library directory ($LIBDIRS)." 1>&2
+if [ ! -d $LIBDIR ]; then +if [ ! -d $LIBDIR ]; then
echo "Error: missing library directory ($LIBDIRS)." 1>&2 + echo "Error: missing library directory ($LIBDIR)." 1>&2
exit 1 exit 1
fi fi
@ -167,7 +169,7 @@
# --- Constants # --- Constants
-readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm" -readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm"
+readonly LIBDIRS="/usr/share/tlp-pm" +readonly LIBDIR="/usr/share/tlp-pm"
readonly LIBS="tlp-functions tlp-rf-func" readonly LIBS="tlp-functions tlp-rf-func"
readonly TLPUSB=tlp-usblist readonly TLPUSB=tlp-usblist
@ -177,8 +179,9 @@
-for libdir in $LIBDIRS; do [ -d $libdir ] && break; done -for libdir in $LIBDIRS; do [ -d $libdir ] && break; done
-if [ ! -d $libdir ]; then -if [ ! -d $libdir ]; then
- echo "Error: missing library directory ($LIBDIRS)." 1>&2
+if [ ! -d $LIBDIR ]; then +if [ ! -d $LIBDIR ]; then
echo "Error: missing library directory ($LIBDIRS)." 1>&2 + echo "Error: missing library directory ($LIBDIR)." 1>&2
exit 1 exit 1
fi fi

Write Preview
Loading…
Cancel
Save