Commit 50f631da authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Merge branch 'nkupdates' into 'master'

Nkupdates

See merge request !50
parents 7f5a1be6 6da19fe8
Pipeline #5423 passed with stages
in 2 minutes and 36 seconds
#!/usr/bin/perl
# awit-ssh - SSH initiator which searches LDAP for host details
# Copyright (c) 2016-2019, AllWorldIT
# Copyright (c) 2016-2020, AllWorldIT
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -77,10 +77,10 @@ use User::pwent;
my $NAME = "AWIT-SSH-Client";
our $VERSION = "0.8.12";
our $VERSION = "0.8.13";
print(STDERR "$NAME v$VERSION - Copyright (c) 2016-2019, AllWorldIT\n\n");
print(STDERR "$NAME v$VERSION - Copyright (c) 2016-2020, AllWorldIT\n\n");
=head1 OPTIONS
......@@ -165,8 +165,8 @@ if (defined(my $rsyncHost = $optctl{'rsync'})) {
# Check if we using libvirt vnc instead of SSH
my $libvirtVNC;
if (defined(my $vmName = $optctl{'libvirt-vnc'})) {
if (! -x '/usr/bin/ssvncviewer') {
logger('ERROR',color('magenta')."To use --libvirt-vnc you need to install ssvncviewer. Hint: apt-get install ssvnc".
if (! -x '/usr/bin/vncviewer') {
logger('ERROR',color('magenta')."To use --libvirt-vnc you need to install vncviewer. Hint: pacman -Syu tigervnc".
color('reset'));
exit 1;
}
......@@ -767,7 +767,7 @@ if (defined($forwardSocket)) {
);
# Run rsync
system('/usr/bin/rsync',
'-vP',
'-vaPHS',
'-e',$sshCmd,
@rsyncParams
);
......@@ -824,7 +824,7 @@ if (defined($forwardSocket)) {
);
# Run rsync
system('/usr/bin/rsync',
'-vP',
'-vaPHS',
'-e',$sshCmd,
@rsyncParams
);
......@@ -883,7 +883,7 @@ if (defined($forwardSocket)) {
# If we still have timeout ticks left, then we connected, hopefully successfully
if ($delay) {
system('/usr/bin/ssvncviewer',
system('/usr/bin/vncviewer',
# '-encodings','copyrect tight hextile zlib corre rre raw',
# '-encodings','tight hextile zlib corre rre raw',
# '-quality','7',
......@@ -1031,7 +1031,7 @@ L<https://gitlab.devlabs.linuxassist.net/allworldit/awit-ssh-client/issues>.
=head1 LICENSE AND COPYRIGHT
Copyright (C) 2016-2019, AllWorldIT
Copyright (C) 2016-2020, AllWorldIT
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -1040,7 +1040,7 @@ the Free Software Foundation, either version 3 of the License, or
=head1 SEE ALSO
L<ssh>(1), L<rsync>(1), L<ssvncviewer>(1).
L<ssh>(1), L<rsync>(1), L<vncviewer>(1).
=cut
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment