From 1381dcb4d30e0c27299c27571237431a08da5d20 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Feb 24 2016 20:15:55 +0000 Subject: Fix: patch should have changed LIBDIRS to LIBDIR, causing a tlp error --- diff --git a/tlp-libdir.patch b/tlp-libdir.patch index 4e41a7b..d70b634 100644 --- a/tlp-libdir.patch +++ b/tlp-libdir.patch @@ -21,14 +21,15 @@ # --- Constants -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" # --- Locate and source libraries -for libdir in $LIBDIRS; do [ -d $libdir ] && break; done -if [ ! -d $libdir ]; then +- echo "Error: missing library directory ($LIBDIRS)." 1>&2 +if [ ! -d $LIBDIR ]; then - echo "Error: missing library directory ($LIBDIRS)." 1>&2 ++ echo "Error: missing library directory ($LIBDIR)." 1>&2 exit 1 fi @@ -62,7 +63,7 @@ # --- Constants -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 RDW_NM_LOCK="rdw_nm" @@ -88,7 +89,7 @@ # --- Constants -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 RDW_DOCK_LOCK="rdw_dock_lock" @@ -137,14 +138,15 @@ # --- Constants -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" # --- Locate and source libraries -for libdir in $LIBDIRS; do [ -d $libdir ] && break; done -if [ ! -d $libdir ]; then +- echo "Error: missing library directory ($LIBDIRS)." 1>&2 +if [ ! -d $LIBDIR ]; then - echo "Error: missing library directory ($LIBDIRS)." 1>&2 ++ echo "Error: missing library directory ($LIBDIR)." 1>&2 exit 1 fi @@ -167,7 +169,7 @@ # --- Constants -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 TLPUSB=tlp-usblist @@ -177,8 +179,9 @@ -for libdir in $LIBDIRS; do [ -d $libdir ] && break; done -if [ ! -d $libdir ]; then +- echo "Error: missing library directory ($LIBDIRS)." 1>&2 +if [ ! -d $LIBDIR ]; then - echo "Error: missing library directory ($LIBDIRS)." 1>&2 ++ echo "Error: missing library directory ($LIBDIR)." 1>&2 exit 1 fi