From c6eceb0aad4e5e3a7ebfd18825b4e68788895dfe Mon Sep 17 00:00:00 2001 From: Guillermo Ramos Date: Fri, 21 Jun 2019 10:46:29 +0200 Subject: TGUTILS_TOKEN instead of separate TGRECV/TGSEND --- tgrecv | 12 ++++++------ tgsend | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tgrecv b/tgrecv index c127523..beaa24b 100755 --- a/tgrecv +++ b/tgrecv @@ -33,12 +33,12 @@ GetOptions("token=s" => \$TOKEN, pod2usage(-verbose => $VERBOSE+1) if $HELP; # If token was not specified in CLI, try to get it from ENV -$TOKEN ||= $ENV{'TGRECV_TOKEN'}; +$TOKEN ||= $ENV{'TGUTILS_TOKEN'}; -# If still no token, try to get it from ~/.config/tgrecv_token +# If still no token, try to get it from ~/.config/tgutils_token unless ($TOKEN) { my $CONFIG_HOME = $ENV{'XDG_CONFIG_HOME'} || $ENV{'HOME'} . "/.config"; - my $CONFIG = "$CONFIG_HOME/tgrecv_token"; + my $CONFIG = "$CONFIG_HOME/tgutils_token"; open(my $cfg, "<", $CONFIG) or pod2usage(-message => "ERROR: Unable to get bot token ($CONFIG: $!).\n", -verbose => 99, -sections => "AUTHENTICATION"); @@ -107,8 +107,8 @@ is available before exiting. To get the bot token, this program will check (in order): - The "--token" CLI argument - - The "TGRECV_TOKEN" environment variable - - The contents of "$XDG_CONFIG_HOME/tgrecv_token" - (usually ~/.config/tgrecv_token) + - The "TGUTILS_TOKEN" environment variable + - The contents of "$XDG_CONFIG_HOME/tgutils_token" + (usually ~/.config/tgutils_token) =cut diff --git a/tgsend b/tgsend index 9f6a7c4..3303da0 100755 --- a/tgsend +++ b/tgsend @@ -29,12 +29,12 @@ GetOptions("token=s" => \$TOKEN, pod2usage(-verbose => $VERBOSE+1) if $HELP or ! @ARGV; # If token was not specified in CLI, try to get it from ENV -$TOKEN ||= $ENV{'TGSEND_TOKEN'}; +$TOKEN ||= $ENV{'TGUTILS_TOKEN'}; -# If still no token, try to get it from ~/.config/tgsend_token +# If still no token, try to get it from ~/.config/tgutils_token unless ($TOKEN) { my $CONFIG_HOME = $ENV{'XDG_CONFIG_HOME'} || $ENV{'HOME'} . "/.config"; - my $CONFIG = "$CONFIG_HOME/tgsend_token"; + my $CONFIG = "$CONFIG_HOME/tgutils_token"; open(my $cfg, "<", $CONFIG) or pod2usage(-message => "ERROR: Unable to get bot token ($CONFIG: $!).\n", -verbose => 99, -sections => "AUTHENTICATION"); @@ -103,8 +103,8 @@ as arguments, using the given bot token. To get the bot token, this program will check (in order): - The "--token" CLI argument - - The "TGSEND_TOKEN" environment variable - - The contents of "$XDG_CONFIG_HOME/tgsend_token" - (usually ~/.config/tgsend_token) + - The "TGUTILS_TOKEN" environment variable + - The contents of "$XDG_CONFIG_HOME/tgutils_token" + (usually ~/.config/tgutils_token) =cut -- cgit v1.2.3