Skip to content

Add support for out-of-$HOME Juniper binaries #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ktims wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for out-of-$HOME Juniper binaries #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions msjnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ our $HOME;
my %OPTS;
my $JNPATH;
my $JNCPATH;
my $JNCLOG;
my $NCSVC;
my $JNCICON;
my $GETCERT = 'getx509certificate.sh';
Expand Down Expand Up @@ -576,7 +577,7 @@ sub _readlog {
# See if we think the log has been changed since the last time
# If it has, then read it in to detect state changes.
# This is kind of a hack but it's the only mostly-accurate way I know of.
my $new = main::filechanged("$JNCPATH/ncsvc.log", $LOG)
my $new = main::filechanged("$JNCLOG", $LOG)
or return 1;

# If the inode is different or the file got smaller it's a new log
Expand All @@ -587,9 +588,9 @@ sub _readlog {
$LOG = $new;

# Look through the log file, starting where we left off last time
open(my $L, '<', "$JNCPATH/ncsvc.log");
open(my $L, '<', "$JNCLOG");
if (! $L) {
$log->("Session: $JNCPATH/ncsvc.log: $!");
$log->("Session: $JNCLOG: $!");
return 0;
}

Expand Down Expand Up @@ -1847,9 +1848,13 @@ sub setpaths {
$HOME = (getpwuid($>))[7];
$HOME && -d $HOME or die "No home directory found!\n";
}

$JNPATH = "$HOME/.juniper_networks";
if ($ENV{'JNPATH'}) {
$JNPATH = $ENV{'JNPATH'};
} else {
$JNPATH = "$HOME/.juniper_networks" if not defined $JNPATH;
}
$JNCPATH = "$JNPATH/network_connect";
$JNCLOG = "$HOME/.juniper_networks/network_connect/ncsvc.log";
if ($ENV{__MSJNC_TEST__}) {
$NCSVC = $ENV{__MSJNC_TEST__};
$INTEST = 1;
Expand Down