Incorporated changes for 1.3.1

CHANGELOG

@@ -1,5 +1,5 @@
     OpenDRS - Online Discrepancy Reporting System
-    Copyright (C) 2018  Rod Wright
+    Copyright (C) 2022  Rod Wright
 
     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
@@ -91,3 +91,7 @@ Changelog
 	- If setting up as a Raspberry Pi terminal/server, included the option
 		to make the terminal a wireless access point if it connects to an
 		ethernet network.
+
+1.3.1 - 2022-05-11
+	- Updated installation scripts and instructions to reflect changes in
+		Raspberry Pi OS Release 2022-04-04.

RPiSetup/ap-setup.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+
+#    ap-setup.sh
+#    OpenDRS Online Discrepancy Reporting System
+#    Copyright (C) 2022  Rod Wright
+
+#    SPDX-License-Identifier: GPL-2.0
+
 # Wireless Access Point Raspberry Pi Setup
 current_user=`whoami`
 if [ "$current_user" != "root" ]

RPiSetup/server-setup.sh

@@ -2,7 +2,7 @@
 
 #    server-setup.sh
 #    OpenDRS Online Discrepancy Reporting System
-#    Copyright (C) 2021  Rod Wright
+#    Copyright (C) 2022  Rod Wright
 
 #    SPDX-License-Identifier: GPL-2.0
 

RPiSetup/terminal-setup.sh

@@ -2,11 +2,12 @@
 
 #    terminal-setup.sh
 #    OpenDRS Online Maintenance Tracking System
-#    Copyright (C) 2021  Rod Wright
+#    Copyright (C) 2022  Rod Wright
 
 #    SPDX-License-Identifier: GPL-2.0
 
 current_user=`whoami`
+current_login=`who am i | awk '{print $1}'`
 if [ "$current_user" != "root" ]
 then
 	echo "You must have root privileges to run this setup."
@@ -23,24 +24,31 @@ echo ""
 echo "You should have already completed the following steps:"
 echo ""
 echo "1. Created a Raspberry Pi OS Lite SD card from the latest release."
-echo "2. Installed the card in a Raspberry Pi, booted it, and logged in as pi."
+echo ""
+echo "2. Installed the card in a Raspberry Pi, booted it, and completed"
+echo "    initial configuration."
+echo ""
 echo "3. Ran sudo raspi-config and :"
-echo "     a. Set locale, timezone, keyboard layout, and wifi country under"
-echo "         Localisation Options. IMPORTANT: Do this first before setting"
-echo "         any passwords. Changing keyboard types usually changes character"
-echo "         mappings, meaning your password after the change may not be what"
-echo "         it was before the change."
-echo "     b. Set a strong password for the pi user."
-echo "     c. Set hostname and, if accessing a network through wifi, the SSID and"
-echo "         passphrase under Network Options."
-echo "     d. Enable SSH under Interfacing Options."
-echo "     e. Set overscan as required to get rid of any black borders around the"
-echo "         edge of the display."
-echo "     f. Reboot when prompted and logged back in as pi."
-echo "4. Transferred the OpenDRS distribution package to /home/pi on the"
+echo "     a. Set locale, timezone, and WLAN Country under"
+echo "         Localisation Options. "
+echo ""
+echo "     b. Set hostname and Boot / Auto Login to Console under System Options."
+echo ""
+echo "     c. If accessing a network through wifi, the Wireless LAN SSID"
+echo "         and passphrase under System Options."
+echo ""
+echo "     d. Enable SSH under Interface Options."
+echo ""
+echo "     e. Set underscan as required under Display Options to get rid of any"
+echo "         black borders around the edge of the display."
+echo ""
+echo "     f. Reboot when prompted and logged back in as $current_login."
+echo ""
+echo "4. Transferred the OpenDRS distribution package to /home/$current_login on the"
 echo "    Raspberry Pi and extracted it."
 echo "5. Changed directory to RPiSetup in the extracted distribution directory."
 echo ""
+echo ""
 echo "If you have completed these steps, press enter to continue. If not,"
 echo -n "press ctrl-c to quit."
 read continueok
@@ -93,7 +101,7 @@ apt install -y --no-install-recommends xorg openbox chromium-browser
 apt install -y cups libcups2-dev cmake
 apt install -y webmin
 addgroup lpadmin
-usermod -a -G lpadmin pi
+usermod -a -G lpadmin $current_login
 systemctl enable getty@tty1.service
 service cups-browsed stop
 systemctl disable cups-browsed.service
@@ -121,7 +129,7 @@ echo ""
 echo ""
 echo ""
 echo ""
-cloneuser `who am i | awk '{print $1}'` customer
+cloneuser $current_login customer
 mkdir -p /home/customer/.config/openbox
 cp home/customer/.profile /home/customer
 cp home/customer/.config/openbox/rc.xml /home/customer/.config/openbox
@@ -160,10 +168,10 @@ echo ""
 echo "$conftype configuration is now complete. "
 echo ""
 echo ""
-echo "It is highly recommended that after rebooting, you run ssh pi@$HOSTNAME"
+echo "It is highly recommended that after rebooting, you run ssh $current_login@$HOSTNAME"
 echo "from another computer on the network, then create new users for"
-echo "yourself and any other administrators using the cloneuser command"
-echo "(cloneuser pi <new username>)."
+echo "any other administrators using the cloneuser command"
+echo "(cloneuser $current_login <new username>)."
 echo ""
 echo ""
 echo "Terminal setup complete."

RaspberryPiSetup.txt

@@ -2,44 +2,37 @@ Raspberry Pi setup
 
 1. Create Raspberry Pi OS Lite SD card from the most recent stable release.
 
-2. Insert SD card in Raspberry Pi and boot.
+2. Insert SD card in Raspberry Pi, boot it, and complete initial config.
 
-3. Login as pi. Default password is raspberry.
-
-4. sudo raspi-config and:
+3. run sudo raspi-config and:
     
     a. Use Localisation Options to:
         1. Set locale to en_US.UTF-8 UTF-8.
         2. Set timezone.
-        3. Set keyboard layout (IMPORTANT! Raspberry Pi OS is made in 
-			England, so unless that's the kind of keyboard you have, the
-			default layout will make your symbols come out wrong! Make 
-			sure you set this before setting any passwords or you may 
-			not be able to log back in!).
-        4. Set WLAN country.
+        3. Set WLAN country.
     
-    b. Set a strong password for the default user (pi).
+    b. Use System Options to:
+		1. Set the hostname.
+		2. Set Boot / Auto Login to Console.
+		3. If accessing the network through WiFi, set the Wireless LAN
+			SSID and passphrase.
+	
+	c. Under Interface Options, enable SSH.
+	
+	d. Under Display Options, set underscan as required to get rid of
+		black screen borders.
+	
+	e. When you've finished, tab down to highlight Finish and hit enter.
     
-    c. Set the desired hostname.
+    f. Reboot when prompted.
     
-    d. Set Wireless LAN SSID and passphrase if using WiFi for networking.
-    
-    e. Use Interfacing Options to enable SSH server.
-    
-    f. If you have black borders on the sides of the screen, use Display
-        Underscan option to change Overscan compensation.
-    
-    g. When you've finished, tab down to highlight Finish and hit enter.
-    
-    h. Reboot when prompted.
-    
-    i. Log back in as pi using the password you set in b. above.
+    g. Log back in as the user you created during initial configuration.
 
-5. Copy OpenDRS distribution package to /home/pi on the Raspberry Pi and extract.
+4. Copy OpenDRS distribution package to the Raspberry Pi and extract.
 
-6. Change directory to the extracted distribution.
+5. Change directory to the extracted distribution.
 
-7. Change directory to RPiSetup.
+6. Change directory to RPiSetup.
 
-8. run sudo ./terminal-setup.sh
+7. run sudo ./terminal-setup.sh
 

distfiles/CHANGELOG

@@ -91,3 +91,7 @@ Changelog
 	- If setting up as a Raspberry Pi terminal/server, included the option
 		to make the terminal a wireless access point if it connects to an
 		ethernet network.
+
+1.3.1 - 2022-05-11
+	- Updated installation scripts and instructions to reflect changes in
+		Raspberry Pi OS Release 2022-04-04.

distfiles/about.php

@@ -78,7 +78,7 @@ echo "
 OpenDRS $drs_version Discrepancy Reporting System
 </h3><br>
 <p>This program is licensed under the terms of the <a href=\"gpl.php\">GNU General Public License</a>. Click on the link
-or see the LICENSE file in the distribution to read it. OpenDRS is Copyright (C) 2018 by Rod Wright.
+or see the LICENSE file in the distribution to read it. OpenDRS is Copyright (C) 2022 by Rod Wright.
 </p>
 <p>
 OpenDRS is a simple online maintenance tracking/discrepancy reporting application. It allows anyone with a web browser to create ,

install.sh

@@ -7,7 +7,7 @@
 #    SPDX-License-Identifier: GPL-2.0
 
 
-DRS_VERSION="1.3.0"
+DRS_VERSION="1.3.1"
 DOC_ROOT="/var/www"
 INSTALL_LOC="opendrs"
 APACHE_USER="www-data"

opendrs-initial.sql

@@ -69,7 +69,7 @@ CREATE TABLE `config` (
 LOCK TABLES `config` WRITE;
 /*!40000 ALTER TABLE `config` DISABLE KEYS */;
 INSERT INTO `config` VALUES 
-(1,'drs_version','1.3.0','1.3.0'),
+(1,'drs_version','1.3.1','1.3.1'),
 (5,'app_name','OpenDRS - Discrepancy Reporting System','OpenDRS Discrepancy Reporting System'),
 (6,'banner','1','1'),
 (7,'background_color','0B3144','0B3144'),

opendrs-update.sql

@@ -216,3 +216,8 @@ ALTER TABLE `writeups` CHANGE COLUMN `period_effective` `functional` tinyint(1)
 -- Update version number
 UPDATE config SET value="1.3.0",defaultvalue="1.3.0" WHERE name="drs_version";
 -- --------------------------------------
+
+-- ---------- version 1.3.1 -------------
+-- Update version number
+UPDATE config SET value="1.3.1",defaultvalue="1.3.1" WHERE name="drs_version";
+-- --------------------------------------