diff --git a/overlay/etc/adduser.conf b/overlay/etc/adduser.conf index 8bca3bf..47cc83b 100644 --- a/overlay/etc/adduser.conf +++ b/overlay/etc/adduser.conf @@ -49,11 +49,12 @@ # created user will be given their own group to use as a default. If # "no", each created user will be placed in the group whose gid is # USERS_GID (see below). -#USERGROUPS=yes +USERGROUPS=no # If USERGROUPS is "no", then USERS_GID should be the GID of the group # `users' (or the equivalent group) on your system. -#USERS_GID=100 +# The et-data group should be set to 1981 +USERS_GID=1981 # If DIR_MODE is set, directories will be created with the specified # mode. Otherwise the default mode 0755 will be used. diff --git a/overlay/etc/environment b/overlay/etc/environment index fdd8935..c844200 100644 --- a/overlay/etc/environment +++ b/overlay/etc/environment @@ -1,6 +1,5 @@ ET_HOME=/opt/emcomm-tools -ET_USER=games -ET_GROUP=games +ET_GROUP=et-data ET_TEMP_DIR=/tmp/et ET_LOG_FILE=$ET_TEMP_DIR/et.log ET_DIST_DIR=/opt/dist diff --git a/overlay/etc/skel/.bash_profile b/overlay/etc/skel/.bash_profile index 29166d1..432b489 100644 --- a/overlay/etc/skel/.bash_profile +++ b/overlay/etc/skel/.bash_profile @@ -1,7 +1,13 @@ # Author : Gaston Gonzalez # Date : 23 April 2024 +# Updated : 9 October 2024 # Description : bash profile +# All user accounts should be in the 'et-data' group to allow data sharing with +# EmComm Tools. A umask of 002 is required to allow users and the system to +# read and write shared data files. +umask 002 + alias pbcopy='xsel --clipboard --input' alias pbpaste='xsel --clipboard --output' diff --git a/overlay/opt/emcomm-tools/conf/radios.d/icom-ic705.json b/overlay/opt/emcomm-tools/conf/radios.d/icom-ic705.json new file mode 100644 index 0000000..a5c8fb0 --- /dev/null +++ b/overlay/opt/emcomm-tools/conf/radios.d/icom-ic705.json @@ -0,0 +1,13 @@ +{ + "id": "icom-ic705", + "vendor": "Icom", + "model": "IC-705", + "rigctrl": { + "id": "3085", + "baud": "9600", + "ptt": "RIG" + }, + "notes": [ + "Enable GPS: [MENU] > [SET] > [Connectors] > [USB (B) Function] > GPS Out = ON" + ] +} diff --git a/scripts/configure-user.sh b/scripts/configure-user.sh index 785551c..5dc8d24 100755 --- a/scripts/configure-user.sh +++ b/scripts/configure-user.sh @@ -2,14 +2,18 @@ # # Author : Gaston Gonzalez # Date : 16 March 2024 -# Updated : 1 October 2024 -# Purpose : Configure users +# Updated : 9 October 2024 +# Purpose : Configure users and groups set -e -et-log "Configuring users" +et-log "Adding '${ET_GROUP}' group..." +groupadd -g 1981 ${ET_GROUP} + +et-log "Configuring users..." cp -r ../overlay/etc/skel /etc/ [ ! -e /etc/skel/Desktop ] && mkdir /etc/skel/Desktop -et-log "Add all users to dialout group" +et-log "Add all users to dialout group..." cp -v -r ../overlay/etc/adduser.conf /etc/ + diff --git a/scripts/env.sh b/scripts/env.sh index d5a4636..55eacfa 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -6,8 +6,7 @@ # Purpose : Global environment variables export ET_HOME=/opt/emcomm-tools -export ET_USER=games -export ET_GROUP=games +export ET_GROUP=et-data export ET_TEMP_DIR=/tmp/et export ET_LOG_FILE=$ET_TEMP_DIR/et.log diff --git a/scripts/fix-panasonic-brightness.sh b/scripts/fix-panasonic-brightness.sh index c4e93cc..46c708f 100755 --- a/scripts/fix-panasonic-brightness.sh +++ b/scripts/fix-panasonic-brightness.sh @@ -2,22 +2,13 @@ # # Author : Gaston Gonzalez # Date : 16 January 2023 -# Updated : 16 March 2024 +# Updated : 9 October 2024 # Purpose : Fix screen brightness on Panasonic hardware et-log "Installing Panasonic brightness fix..." apt install inotify-tools -y -if [ ! -e $ET_HOME/sbin ]; then - mkdir -v -p $ET_HOME/sbin - chown -v $ET_USER:$ET_GROUP $ET_HOME/sbin -fi - -cp -v ../overlay/$ET_HOME/sbin/panasonic-set-brightness.sh $ET_HOME/sbin/ -chmod -v 755 $ET_HOME/sbin/panasonic-set-brightness.sh -chown -v $ET_USER:$ET_GROUP $ET_HOME/sbin/* - cp -v ../overlay/lib/systemd/system/panasonic-brightness.service /lib/systemd/system/ systemctl daemon-reload diff --git a/scripts/install-emcomm-tools.sh b/scripts/install-emcomm-tools.sh index 1ce70cb..20cb349 100755 --- a/scripts/install-emcomm-tools.sh +++ b/scripts/install-emcomm-tools.sh @@ -2,6 +2,7 @@ # # Author : Gaston Gonzalez # Date : 6 October 2024 +# Updated : 9 October 2024 # Purpose : Install EmComm Tools applications et-log "Installing EmComm Tools applications..." @@ -11,4 +12,8 @@ if [ ! -e $ET_HOME ]; then fi cp -v -r ../overlay/$ET_HOME/* $ET_HOME -chown -v -R $ET_USER:$ET_GROUP $ET_HOME + +et-log "Setting up permission for shared data access..." +chgrp -v -R $ET_GROUP $ET_HOME/conf/radios.d +chmod -v 775 $ET_HOME/conf/radios.d +chmod -v 664 $ET_HOME/conf/radios.d/*.json