Changeset 299

Timestamp:

08/15/08 20:36:18 (3 months ago)

Author:

mbr

Message:

update to import perl modules via a function and 'require' statements, added --Lib-dir arg

Files:

• gpgdir/trunk/gpgdir (modified) (7 diffs)

gpgdir/trunk/gpgdir

@@ -32 +32 @@
-#
-
-use lib '/usr/lib/gpgdir';
-use File::Find;
-use File::Copy;
-use Term::ReadKey;
-use GnuPG::Interface;
-use IO::File;
-use IO::Handle;
@@ -61 +58 @@
-my $include_pat     = '';
-my $include_file    = '';
+my $lib_dir         = '/usr/lib/gpgdir';
-my $pid_file        = '';
-my $total_encrypted = 0;
@@ -181 +179 @@
-    'no-LC_ALL'      => \$no_locale,
-    'no-locale'      => \$no_locale,       # synonym
+    'Lib-dir=s'      => \$lib_dir,         # Path to perl module path
-    'verbose'        => \$verbose,         # Verbose mode.
-    'Version'        => \$printver,        # Print version
@@ -204 +203 @@
-    die "[*] The -d and --overwrite-encrypted options are incompatible.";
-}
+
+### import perl modules (GnuPG::Interface, etc.)
+&import_perl_modules();
-
-if ($wipe_mode) {
@@ -1080 +1082 @@
-        my $msg = 'Password: ';
-        ### get the password without echoing the chars back to the screen
- 'noecho'
+('noecho')
-        while (! $pw) {
-            print $msg;
- 0
+(0)
-            chomp $pw;
-        }
- 'normal'
+('normal')
-        if ($quiet) {
-            print "\n";
@@ -1204 +1206 @@
-    close P;
-    return;
+}
+
+sub import_perl_modules() {
+
+    my $mod_paths_ar = &get_mod_paths();
+
+    if ($#$mod_paths_ar > -1) {  ### /usr/lib/gpgdir/ exists
+        push @$mod_paths_ar, @INC;
+        splice @INC, 0, $#$mod_paths_ar+1, @$mod_paths_ar;
+    }
+
+    if ($verbose) {
+        print "[+] import_perl_modules(): The \@INC array:\n";
+        print "$_\n" for @INC;
+    }
+
+    require GnuPG::Interface;
+    require Term::ReadKey;
+
+    Term::ReadKey->import(qw/ReadMode ReadLine/);
+
+    return;
+}
+
+sub get_mod_paths() {
+
+    my @paths = ();
+
+    unless (-d $lib_dir) {
+        my $dir_tmp = $lib_dir;
+        $dir_tmp =~ s|lib/|lib64/|;
+        if (-d $dir_tmp) {
+            $lib_dir = $dir_tmp;
+        } else {
+            return [];
+        }
+    }
+
+    opendir D, $lib_dir or die "[*] Could not open $lib_dir: $!";
+    my @dirs = readdir D;
+    closedir D;
+
+    push @paths, $lib_dir;
+
+    for my $dir (@dirs) {
+        ### get directories like "/usr/lib/gpgdir/x86_64-linux"
+        next unless -d "$lib_dir/$dir";
+        push @paths, "$lib_dir/$dir"
+            if $dir =~ m|linux| or $dir =~ m|thread|;
+    }
+    return \@paths;
-}
-
@@ -1285 +1338 @@
-    -u, --user-homedir <dir>    - Path to home directory.
-    -l, --locale <locale>       - Manually define a locale setting.
+    --Lib-dir <path>            - Path to the perl modules directory (not
+                                  usually necessary).
-    --no-locale                 - Don't set the locale to anything (the
-                                  default is the "C" locale).