Changeset 9898 for trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Nov 7, 2006, 12:56:41 PM (20 years ago)

Author:

Paul Price

Message:

Adding interpolation of environment variables within paths.

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (3 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.3 2006-11-07 03:18:39 price Exp $
+# $Id: Config.pm,v 1.4 2006-11-07 22:56:41 price Exp $
 
 package PS::IPP::Config;
@@ -42 +42 @@
     my $mdc = $parser->parse( join '', @contents); # The parsed metadata config
 
-    my $path = _mdLookupStr($mdc, 'PATH'); # The path
-    my $workdir = _mdLookupStr($mdc, 'WORKDIR'); # The working directory
+    my $path = _interpolate_env(_mdLookupStr($mdc, 'PATH')); # The path
+    my $workdir = _interpolate_env(_mdLookupStr($mdc, 'WORKDIR')); # The working directory
     croak "PATH is not set in $name\n" unless defined $path;
     croak "WORKDIR is not set in $name\n" unless defined $workdir;
+
+    # Interpolate environment variables in the work directory
 
     my $self = {
@@ -182 +184 @@
 
 
+# Interpolate environment variables in a directory (or colon-delimited list of directories)
+sub _interpolate_env
+{
+    my $dir = shift;            # Directory of interest
+
+    return undef unless defined $dir;
+
+    print "Checking $dir\n";
+
+    while ($dir =~ /\$\{?(\w*)[\}\/:]?/) {
+        my $name = $1;          # Environment variable name
+        my $value = $ENV{$name}; # Environment variable value
+        print "Replacing $name with $value.\n";
+        $dir =~ s/\$\{?$name\}?/$value\//;
+    }
+    return $dir;
+}
+
 # Lookup the metadata, checking the type is STR
 sub _mdLookupStr