Changeset 45

Show
Ignore:
Timestamp:
07/25/06 16:01:49 (2 years ago)
Author:
jm3
Message:
  • added additional config file variable and removed some hardcoded references to the root dir.
  • Nb. there are *still* some hardcoded paths inside the perl file... *we have* to fix these before we can beta!!!
  • added additional error dump to gm script
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • 10kz/scripts/crypto-ui-injector.user.js

    r44 r45  
    240240                                                        return bail( "Incorrect password - please try again" ); 
    241241                                                else 
    242                                                         return bail( "Unexpected error back from GPG when signing message" ); 
     242                                                        return bail( "Unexpected error back from GPG when signing message: " + resp ); 
    243243                                        } 
    244244                                } else { 
  • 10kz/shell/configure.sh

    r43 r45  
    11 
     2export ROOT=/usr/local/10kz 
    23export KEY_HOME=/Users/jmanoogi/.gnupg 
    34export GPG_HOME=/usr/local/bin 
  • 10kz/shell/decode-form-post.jm3

    r43 r45  
    11#!/bin/bash 
     2 
     3# pull in config params like KEY_HOME, GPG_HOME, and app ROOT 
     4. configure.sh 
    25 
    36echo Content-type: text/plain 
     
    811        exit 1 
    912fi 
     13         
     14root=$ROOT/shell 
    1015 
    1116#echo "<pre>" 
     
    2934 
    3035 
    31         decoded=`echo $safe_value | /Users/erdnase/www/10kz/shell/urldecode | sed "s/^'//" | sed "s/'$//"` 
     36        decoded=`echo $safe_value | $root/urldecode | sed "s/^'//" | sed "s/'$//"` 
    3237        echo decoded value is \'$decoded\' 
    33         export `echo $name`="`echo '$value' | /Users/erdnase/www/10kz/shell/urldecode`" 
     38        export `echo $name`="`echo '$value' | $root/urldecode`" 
    3439        echo 
    3540done </tmp/params 
  • 10kz/shell/get-secret-keys-as-html.jm3

    r43 r45  
    22# $Id$ 
    33 
    4 HOMEDIR="/Users/erdnase/.gnupg/" 
     4# pull in config params like KEY_HOME, GPG_HOME, and app ROOT 
     5. configure.sh 
    56 
    67echo Content-type: text/HTML 
     
    910 
    1011echo "<select value='key_id'>" 
    11 /sw/bin/gpg --list-secret-keys --no-permission-warning --load-extension idea --homedir $HOMEDIR | grep '^sec' \ 
     12/sw/bin/gpg --list-secret-keys --no-permission-warning --load-extension idea --homedir $KEY_HOME | grep '^sec' \ 
    1213        | sed "s:^sec .*/::" \ 
    1314        | sed "s/^\([0-9A-F]*\) \(.*\)$/<option value='\1'>\1 \/ \2<\/option>/" \ 
  • 10kz/shell/get-secret-keys.jm3

    r43 r45  
    22# $Id$ 
    33 
     4# pull in config params like KEY_HOME, GPG_HOME, and app ROOT 
    45. configure.sh 
    56 
  • 10kz/shell/perl.jm3

    r43 r45  
    1010$debug = 0; 
    1111 
    12 my $bin = "/sw/bin"; 
    13 my $gpg_home = "/Users/erdnase/www/10kz/gpg-home"; 
     12# FIXME: ugh, unless we perl-ify the other shell scripts, we need a way to share the configure.sh info between perl + shell 
     13my $bin = "/usr/local/bin";  
     14my $KEY_HOME = "/Users/jmanoogi/.gnupg"; 
    1415 
    1516#print header; 
     
    4041 
    4142        my $default_ops = "--no-tty " 
    42                 . " --no-permission-warning --load-extension idea --homedir /Users/erdnase/.gnupg"; 
     43                . " --no-permission-warning --load-extension idea --homedir $KEY_HOME"; 
    4344        my $recips = "$recipients -r $key_id --default-key $key_id "; 
    4445 
  • 10kz/shell/sign-encrypt.jm3

    r43 r45  
    11#!/bin/bash 
    22# $Id$ 
     3 
     4# pull in config params like KEY_HOME, GPG_HOME, and app ROOT 
     5. configure.sh 
    36 
    47KEY_ID=9112BC51 
    58KEY_ID=19ACA985 
    69PASSPHRASE="dingus magic" 
    7 HOMEDIR="/Users/erdnase/.gnupg/" 
    810PLAINTEXT=working-context/foo.txt 
    911RECIPIENTS="jas@juniorplenty.com nick@nicksfriends.com" 
     
    3537                                -r $KEY_ID \ 
    3638                                --default-key $KEY_ID \ 
    37                                 --homedir $HOMEDIR
     39                                --homedir $KEY_HOME
    3840                                --no-permission-warning \ 
    3941                                --command-fd 0 \