Merge pull request #3951 from hearthminion/feature/group_id

Add ability to differentiate group ownership from user ownership.

Author: joolswills

retropie_packages.sh

@@ -16,19 +16,35 @@ __version="4.8.8"
 # main retropie install location
 rootdir="/opt/retropie"
 
-# if __user is set, try and install for that user, else use SUDO_USER
-if [[ -n "$__user" ]]; then
-    user="$__user"
-    if ! id -u "$__user" &>/dev/null; then
-        echo "User $__user not exist"
-        exit 1
-    fi
-else
-    user="$SUDO_USER"
-    [[ -z "$user" ]] && user="$(id -un)"
+# if no user is specified
+if [[ -z "$__user" ]]; then
+    # get the calling user from sudo env
+    __user="$SUDO_USER"
+    # if not called from sudo get the current user
+    [[ -z "$__user" ]] && __user="$(id -un)"
+fi
+
+# check if the user exists
+if [[ -z "$(getent passwd "$__user")" ]]; then
+    echo "User $__user does not exist."
+    exit 1
+fi
+
+# if no group is specified get the users primary group
+if [[ -z "$__group" ]]; then
+    __group="$(id -gn "$__user")"
 fi
 
-home="$(eval echo ~$user)"
+# check if the group exists
+if [[ -z "$(getent group "$__group")" ]]; then
+    echo "Group $__group does not exist."
+    exit 1
+fi
+
+# backwards compatibility
+user="$__user"
+
+home="$(eval echo ~$__user)"
 datadir="$home/RetroPie"
 biosdir="$datadir/BIOS"
 romdir="$datadir/roms"
@@ -49,7 +65,7 @@ if [[ "$(id -u)" -ne 0 ]]; then
     exit 1
 fi
 
-__backtitle="retropie.org.uk - RetroPie Setup. Installation folder: $rootdir for user $user"
+__backtitle="retropie.org.uk - RetroPie Setup. Installation folder: $rootdir for user $__user"
 
 source "$scriptdir/scriptmodules/system.sh"
 source "$scriptdir/scriptmodules/helpers.sh"

scriptmodules/admin/apidocs.sh

@@ -47,7 +47,7 @@ function build_apidocs() {
 
 function install_apidocs() {
     rsync -a --delete "$md_build/html/" "$__tmpdir/apidocs/"
-    chown -R $user:$user "$__tmpdir/apidocs"
+    chown -R "$__user":"$__group" "$__tmpdir/apidocs"
 }
 
 function upload_apidocs() {

scriptmodules/admin/setup.sh

@@ -20,7 +20,7 @@ function _setup_gzip_log() {
 function rps_logInit() {
     if [[ ! -d "$__logdir" ]]; then
         if mkdir -p "$__logdir"; then
-            chown $user:$user "$__logdir"
+            chown "$__user":"$__group" "$__logdir"
         else
             fatalError "Couldn't make directory $__logdir"
         fi
@@ -32,13 +32,13 @@ function rps_logInit() {
     local now=$(date +'%Y-%m-%d_%H%M%S')
     logfilename="$__logdir/rps_$now.log.gz"
     touch "$logfilename"
-    chown $user:$user "$logfilename"
+    chown "$__user":"$__group" "$logfilename"
     time_start=$(date +"%s")
 }
 
 function rps_logStart() {
     echo -e "Log started at: $(date -d @$time_start)\n"
-    echo "RetroPie-Setup version: $__version ($(sudo -u "$user" git -C "$scriptdir" log -1 --pretty=format:%h))"
+    echo "RetroPie-Setup version: $__version ($(sudo -u "$__user" git -C "$scriptdir" log -1 --pretty=format:%h))"
     echo "System: $__platform ($__platform_arch) - $__os_desc - $(uname -a)"
 }
 
@@ -95,8 +95,8 @@ function depends_setup() {
     if ! isPlatform "x11"; then
         local group
         for group in input video; do
-            if ! hasFlag "$(groups $user)" "$group"; then
-                dialog --yesno "Your user '$user' is not a member of the system group '$group'.\n\nThis is needed for RetroPie to function correctly. May I add '$user' to group '$group'?\n\nYou will need to restart for these changes to take effect." 22 76 2>&1 >/dev/tty && usermod -a -G "$group" "$user"
+            if ! hasFlag "$(groups $__user)" "$group"; then
+                dialog --yesno "Your user '$__user' is not a member of the system group '$group'.\n\nThis is needed for RetroPie to function correctly. May I add '$__user' to group '$group'?\n\nYou will need to restart for these changes to take effect." 22 76 2>&1 >/dev/tty && usermod -a -G "$group" "$__user"
             fi
         done
     fi
@@ -111,7 +111,7 @@ function depends_setup() {
 function updatescript_setup()
 {
     clear
-    chown -R $user:$user "$scriptdir"
+    chown -R "$__user":"$__group" "$scriptdir"
     printHeading "Fetching latest version of the RetroPie Setup Script."
     pushd "$scriptdir" >/dev/null
     if [[ ! -d ".git" ]]; then
@@ -120,7 +120,7 @@ function updatescript_setup()
         return 1
     fi
     local error
-    if ! error=$(sudo -u "$user" git pull --ff-only 2>&1 >/dev/null); then
+    if ! error=$(sudo -u "$__user" git pull --ff-only 2>&1 >/dev/null); then
         printMsgs "dialog" "Update failed:\n\n$error"
         popd >/dev/null
         return 1
@@ -680,7 +680,7 @@ function gui_setup() {
     depends_setup
     local default
     while true; do
-        local commit=$(sudo -u "$user" git -C "$scriptdir" log -1 --pretty=format:"%cr (%h)")
+        local commit=$(sudo -u "$__user" git -C "$scriptdir" log -1 --pretty=format:"%cr (%h)")
 
         cmd=(dialog --backtitle "$__backtitle" --title "RetroPie-Setup Script" --cancel-label "Exit" --item-help --help-button --default-item "$default" --menu "Version: $__version - Last Commit: $commit\nSystem: $__platform ($__platform_arch) - running on $__os_desc" 22 76 16)
         options=(

scriptmodules/admin/stats.sh

@@ -42,7 +42,7 @@ function build_stats() {
 
     cp -rv "$md_data/licences" "$dest/"
     cp -rv "$md_data/pkgflags" "$dest/"
-    chown -R $user:$user "$dest"
+    chown -R "$__user":"$__group" "$dest"
 }
 
 function upload_stats() {

scriptmodules/admin/wikidocs.sh

@@ -28,7 +28,7 @@ function build_wikidocs() {
 
 function install_wikidocs() {
     rsync -a --delete "$md_build/site/" "$__tmpdir/wikidocs/"
-    chown -R $user:$user "$__tmpdir/wikidocs"
+    chown -R "$__user":"$__group" "$__tmpdir/wikidocs"
 }
 
 function upload_wikidocs() {

scriptmodules/emulators/advmame.sh

@@ -89,7 +89,7 @@ function configure_advmame() {
 
     if [[ "$md_mode" == "install" && ! -f "$md_conf_root/mame-advmame/$md_id.rc" ]]; then
 
-        su "$user" -c "$md_inst/bin/advmame --default"
+        su "$__user" -c "$md_inst/bin/advmame --default"
 
         iniConfig " " "" "$md_conf_root/mame-advmame/$md_id.rc"
 

scriptmodules/emulators/ags.sh

@@ -84,6 +84,6 @@ echo "ROM parameter for AGS engine: \$ROM" >> /dev/shm/runcommand.log
 $binary "${params[*]}" "\$ROM"
 _EOF_
 
-    chown "$user":"$user" "$launcher"
+    chown "$__user":"$__group" "$launcher"
     chmod u+x "$launcher"
 }

scriptmodules/emulators/amiberry.sh

@@ -145,7 +145,7 @@ function configure_amiberry() {
     fi
 
     moveConfigDir "$md_inst/kickstarts" "$biosdir/amiga"
-    chown -R $user:$user "$biosdir/amiga"
+    chown -R "$__user":"$__group" "$biosdir/amiga"
 
     # symlink the retroarch config / autoconfigs for amiberry to use
     ln -sf "$configdir/all/retroarch/autoconfig" "$md_inst/controllers"
@@ -159,7 +159,7 @@ function configure_amiberry() {
     # copy game-data, save-data folders, boot-data.zip and WHDLoad
     cp -R "$md_inst/whdboot-dist/"{game-data,save-data,boot-data.zip,WHDLoad} "$config_dir/whdboot/"
 
-    chown -R $user:$user "$config_dir/whdboot"
+    chown -R "$__user":"$__group" "$config_dir/whdboot"
 
     # copy shared uae4arm/amiberry launch script while setting is_amiberry=1
     sed "s/is_amiberry=0/is_amiberry=1/" "$md_data/../uae4arm/uae4arm.sh" >"$md_inst/amiberry.sh"
@@ -171,5 +171,5 @@ function configure_amiberry() {
 "$md_inst/amiberry.sh"
 _EOF_
     chmod a+x "$romdir/amiga/$script"
-    chown $user:$user "$romdir/amiga/$script"
+    chown "$__user":"$__group" "$romdir/amiga/$script"
 }

scriptmodules/emulators/daphne.sh

@@ -79,7 +79,7 @@ fi
 _EOF_
     chmod +x "$md_inst/daphne.sh"
 
-    chown -R $user:$user "$md_inst"
-    chown -R $user:$user "$md_conf_root/daphne/dapinput.ini"
+    chown -R "$__user":"$__group" "$md_inst"
+    chown -R "$__user":"$__group" "$md_conf_root/daphne/dapinput.ini"
 
 }

scriptmodules/emulators/dgen.sh

@@ -64,7 +64,7 @@ function configure_dgen() {
 
     if [[ ! -f "$md_conf_root/megadrive/dgenrc" ]]; then
         cp "sample.dgenrc" "$md_conf_root/megadrive/dgenrc"
-        chown $user:$user "$md_conf_root/megadrive/dgenrc"
+        chown "$__user":"$__group" "$md_conf_root/megadrive/dgenrc"
     fi
 
     iniConfig " = " "" "$md_conf_root/megadrive/dgenrc"