summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVictor Lowther <victor.lowther@gmail.com>2008-03-05 15:26:47 -0600
committerVictor Lowther <victor.lowther@gmail.com>2008-03-05 15:26:47 -0600
commit9232cd18a317936de20d365b4e9178eead4c7c41 (patch)
treea1982beea1f493feac9de456118f1ae45905fdc1 /src
parent94722ed73c79fefc3e98c6cd1c194eddeb325aeb (diff)
Split functions.in into functions.in and pm-functions.in
pm-functions.in contains the functionality that should only be used by the pm-utils frontends (pm-action, pm-is-supported, and pm-powersave). functions.in contains code that is shared between the hooks and the pm-utils frontends. The reason behind splitting this out is to reduce namespace pollution in the hooks.
Diffstat (limited to 'src')
-rw-r--r--src/pm-action.in3
-rw-r--r--src/pm-is-supported.in2
-rw-r--r--src/pm-powersave.in3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/pm-action.in b/src/pm-action.in
index e87b7f8..32525c8 100644
--- a/src/pm-action.in
+++ b/src/pm-action.in
@@ -85,8 +85,7 @@ do
shift
done
-export PM_FUNCTIONS="@PM-UTILS-LIBDIR@/functions"
-. "${PM_FUNCTIONS}"
+. "@PM-UTILS-LIBDIR@/pm-functions"
ACTION="$(echo ${0##*pm-} |tr - _)"
diff --git a/src/pm-is-supported.in b/src/pm-is-supported.in
index bfce1ae..9446846 100644
--- a/src/pm-is-supported.in
+++ b/src/pm-is-supported.in
@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-. "@PM-UTILS-LIBDIR@/functions"
+. "@PM-UTILS-LIBDIR@/pm-functions"
help_options()
{
diff --git a/src/pm-powersave.in b/src/pm-powersave.in
index a1cdb4a..d0c2d5f 100644
--- a/src/pm-powersave.in
+++ b/src/pm-powersave.in
@@ -25,8 +25,7 @@
#
POWERSAVE_LOGFILE="/dev/null"
-export PM_FUNCTIONS="@PM-UTILS-LIBDIR@/functions"
-. "${PM_FUNCTIONS}"
+. "@PM-UTILS-LIBDIR@/pm-functions"
if [ "$1" = "true" -o "$1" = "false" ] ; then
init_logfile "${POWERSAVE_LOGFILE}"