From 7535cdd94edb94ea5fd7bc97d41b8a7fe0df2b5b Mon Sep 17 00:00:00 2001
From: Simon Long <simon@raspberrypi.org>
Date: Thu, 6 Feb 2020 11:52:12 +0000
Subject: [PATCH] Add new is_installed function; fix bug preventing VNC server
 from being stopped

---
 raspi-config | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/raspi-config b/raspi-config
index 4bef83a..72960f2 100755
--- a/raspi-config
+++ b/raspi-config
@@ -81,6 +81,14 @@ is_fkms() {
   fi
 }
 
+is_installed() {
+    if [ "$(dpkg -l "$1" 2> /dev/null | tail -n 1 | cut -d ' ' -f 1)" != "ii" ]; then
+      return 1
+    else
+      return 0
+    fi
+}
+
 deb_ver () {
   ver=`cat /etc/debian_version | cut -d . -f 1`
   echo $ver
@@ -803,7 +811,7 @@ do_vnc() {
     RET=$1
   fi
   if [ $RET -eq 0 ]; then
-    if [ -d /usr/share/doc/realvnc-vnc-server ] || apt-get install realvnc-vnc-server; then
+    if is_installed realvnc-vnc-server || apt install -y realvnc-vnc-server; then
       systemctl enable vncserver-x11-serviced.service &&
       systemctl start vncserver-x11-serviced.service &&
       STATUS=enabled
@@ -811,10 +819,8 @@ do_vnc() {
       return 1
     fi
   elif [ $RET -eq 1 ]; then
-    if [ ! -d /usr/share/doc/realvnc-vnc-server ] ; then
-        systemctl disable vncserver-x11-serviced.service
-        systemctl stop vncserver-x11-serviced.service
-    fi
+    systemctl disable vncserver-x11-serviced.service
+    systemctl stop vncserver-x11-serviced.service
     STATUS=disabled
   else
     return $RET