Skip to content
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

Jump to bottom

update tests/vnc.bats (fixes #2126) #2127

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update tests/vnc.bats (fixes #2126) #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b9af88
increase checkargn (fixes #2126)
JLKwong Mar 24, 2021
9095292
vnc.bats replace vncpasswd with vnc (fixes #2126)
JLKwong Mar 24, 2021
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
8 changes: 7 additions & 1 deletion modules/vnc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function restart_vnc_service {
function vnc {
local option bootoptionstatus vncservicestatus xservicestatus ipaddress isgraphical
checkroot
checkargn $# 2
checkargn $# 4
option=$1
auth=$2
bootoptionstatus=$(systemctl is-enabled graphical.target)
Expand All @@ -34,6 +34,7 @@ function vnc {

case "$option" in
"")
checkargn $# 2
if [ "$bootoptionstatus" = "static" ] && [ "$vncservicestatus" = "inactive" ] && [ "$xservicestatus" = "inactive" ]; then
echo "VNC is disabled."
echo "To enable it, use $BASENAME vnc on"
Expand All @@ -50,6 +51,7 @@ function vnc {
fi
;;
"on")
checkargn $# 2
grep -qF 'hdmi_group=2' '/boot/config.txt' || echo 'hdmi_group=2' | tee -a '/boot/config.txt'
grep -qF 'hdmi_mode=82' '/boot/config.txt' || echo 'hdmi_mode=82' | tee -a '/boot/config.txt'
sed -i 's/#hdmi_force_hotplug=1/hdmi_force_hotplug=1/' /boot/config.txt
Expand All @@ -62,6 +64,7 @@ function vnc {
echo "You can then remotely access the system with a VNC client using the IP address: $ipaddress"
;;
"off")
checkargn $# 2
sed -i '/hdmi_group=2/d' /boot/config.txt
sed -i '/hdmi_mode=82/d' /boot/config.txt
sed -i 's/hdmi_force_hotplug=1/#hdmi_force_hotplug=1/' /boot/config.txt
Expand All @@ -73,6 +76,7 @@ function vnc {
echo "Please reboot the system for changes to take effect."
;;
"info")
checkargn $# 2
echo "The system boots into $isgraphical"
echo "The VNC service is $vncservicestatus"
echo "The X window service is $xservicestatus"
Expand Down Expand Up @@ -142,10 +146,12 @@ function vnc {
esac
;;
"password")
checkargn $# 2
echo "Creating password of VNC service mode for VNC password authentication..."
vncpasswd -service
;;
*)
checkargn $# 2
log_and_exit1 "Error: only 'on', 'off', 'info', 'auth', 'password' options are supported"
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion tests/vnc.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ load test-helper
}

@test "$clinom vnc auth vnc" {
run "${clicmd}" vnc auth vncpasswd
run "${clicmd}" vnc auth vnc
assert_success && assert_output -p 'password'
}

Expand Down