From cabd4289a669161b562330167633897efffaf01c Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Mon, 13 Jan 2020 12:49:43 +0000
Subject: [PATCH] Fix VNC options

Fixes #74
---
 debian/changelog |  1 +
 raspi-config     | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec10df2..0f4020d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ raspi-config (20200109) UNRELEASED; urgency=medium
 
   * Add proxy configuration
   * Handle cases where SUDO_USER is unset
+  * Fix VNC options
 
  -- Serge Schneider <serge@raspberrypi.org>  Thu, 09 Jan 2020 14:38:50 +0000
 
diff --git a/raspi-config b/raspi-config
index 40c6a46..119be86 100755
--- a/raspi-config
+++ b/raspi-config
@@ -800,15 +800,18 @@ do_vnc() {
     RET=$1
   fi
   if [ $RET -eq 0 ]; then
-    if [ ! -d /usr/share/doc/realvnc-vnc-server ] ; then
-        apt-get install realvnc-vnc-server
+    if [ -d /usr/share/doc/realvnc-vnc-server ] || apt-get install realvnc-vnc-server; then
+      systemctl enable vncserver-x11-serviced.service &&
+      systemctl start vncserver-x11-serviced.service &&
+      STATUS=enabled
+    else
+      return 1
     fi
-    systemctl enable vncserver-x11-serviced.service &&
-    systemctl start vncserver-x11-serviced.service &&
-    STATUS=enabled
   elif [ $RET -eq 1 ]; then
-    systemctl disable vncserver-x11-serviced.service &&
-    systemctl stop vncserver-x11-serviced.service &&
+    if [ ! -d /usr/share/doc/realvnc-vnc-server ] ; then
+        systemctl disable vncserver-x11-serviced.service
+        systemctl stop vncserver-x11-serviced.service
+    fi
     STATUS=disabled
   else
     return $RET