esthemes - added support for theme branches so we can manage our carbon themes more easily

Author: joolswills

scriptmodules/supplementary/esthemes.sh

@@ -22,42 +22,45 @@ function depends_esthemes() {
 }
 
 function _has_pixel_pos_esthemes() {
+    local pixel_pos=0
     # get the version of emulationstation installed so we can check whether to show
-    # themes that use the new pixel based positioning capabilities
-    local supp_path="$rootdir/supplementary"
-    local es_path="$supp_path/emulationstation"
-    local esdev_path="${es_path}-dev"
-    # check if emulationstation-dev is installed
-    if [[ -d "$esdev_path" ]]; then
-        es_path="$esdev_path"
-    fi
-    # extract the version number from emulationstation --help
-    local es_ver="$("$es_path/emulationstation" --help | grep -oP "Version \K[^,]+")"
-    # if emulationstation is newer than 2.10 enable pixel based themes
+    # themes that use the new pixel based positioning - we run as $user as the
+    # emulationstation launch script will exit if run as root
+    local es_ver="$(sudo -u $user /usr/bin/emulationstation --help | grep -oP "Version \K[^,]+")"
+    # if emulationstation is newer than 2.10, enable pixel based themes
     compareVersions "$es_ver" ge "2.10" && pixel_pos=1
     echo "$pixel_pos"
 }
 
 function install_theme_esthemes() {
     local theme="$1"
     local repo="$2"
-    local default_branch
+    local branch="$3"
 
     local pixel_pos="$(_has_pixel_pos_esthemes)"
 
     if [[ -z "$repo" ]]; then
         repo="RetroPie"
     fi
+
     if [[ -z "$theme" ]]; then
         theme="carbon"
         repo="RetroPie"
         [[ "$pixel_pos" -eq 1 ]] && theme+="-2021"
     fi
-    # Get the name of the default branch, fallback to 'master' if not found
-    default_branch=$(runCmd git ls-remote --symref --exit-code "https://github.com/$repo/es-theme-$theme.git" HEAD | grep -oP ".*/\K[^\t]+")
-    [[ -z "$default_branch" ]] && default_branch="master"
+
+    local name="$theme"
+
+    if [[ -z "$branch" ]]; then
+        # Get the name of the default branch, fallback to 'master' if not found
+        branch=$(runCmd git ls-remote --symref --exit-code "https://github.com/$repo/es-theme-$theme.git" HEAD | grep -oP ".*/\K[^\t]+")
+        [[ -z "$branch" ]] && branch="master"
+    else
+        name+="-$branch"
+    fi
+
     mkdir -p "/etc/emulationstation/themes"
-    gitPullOrClone "/etc/emulationstation/themes/$theme" "https://github.com/$repo/es-theme-$theme.git" "$default_branch"
+    gitPullOrClone "/etc/emulationstation/themes/$name" "https://github.com/$repo/es-theme-$theme.git" "$branch"
 }
 
 function uninstall_theme_esthemes() {
@@ -75,8 +78,8 @@ function gui_esthemes() {
     if [[ "$pixel_pos" -eq 1 ]]; then
         themes+=(
             'RetroPie carbon-2021'
-            'RetroPie carbon-centered-2021'
-            'RetroPie carbon-nometa-2021'
+            'RetroPie carbon-2021 centered'
+            'RetroPie carbon-2021 nometa'
         )
     fi
 
@@ -295,6 +298,10 @@ function gui_esthemes() {
     )
     while true; do
         local theme
+        local theme_dir
+        local branch
+        local name
+
         local installed_themes=()
         local repo
         local options=()
@@ -317,13 +324,20 @@ function gui_esthemes() {
             theme=($theme)
             repo="${theme[0]}"
             theme="${theme[1]}"
-            if [[ -d "/etc/emulationstation/themes/$theme" ]]; then
+            branch="${theme[2]}"
+            name="$repo/$theme"
+            theme_dir="$theme"
+            if [[ -n "$branch" ]]; then
+                name+=" ($branch)"
+                theme_dir+="-$branch"
+            fi
+            if [[ -d "/etc/emulationstation/themes/$theme_dir" ]]; then
                 status+=("i")
-                options+=("$i" "Update or Uninstall $repo/$theme (installed)")
-                installed_themes+=("$theme $repo")
+                options+=("$i" "Update or Uninstall $name (installed)")
+                installed_themes+=("$theme $repo $branch")
             else
                 status+=("n")
-                options+=("$i" "Install $repo/$theme")
+                options+=("$i" "Install $name")
             fi
             ((i++))
         done
@@ -362,27 +376,34 @@ function gui_esthemes() {
             U)
                 for theme in "${installed_themes[@]}"; do
                     theme=($theme)
-                    rp_callModule esthemes install_theme "${theme[0]}" "${theme[1]}"
+                    rp_callModule esthemes install_theme "${theme[0]}" "${theme[1]}" "${theme[2]}"
                 done
                 ;;
             *)
                 theme=(${themes[choice-1]})
                 repo="${theme[0]}"
                 theme="${theme[1]}"
+                branch="${theme[2]}"
+                name="$repo/$theme"
+                theme_dir="$theme"
+                if [[ -n "$branch" ]]; then
+                    name+=" ($branch)"
+                    theme_dir+="-$branch"
+                fi
                 if [[ "${status[choice]}" == "i" ]]; then
-                    options=(1 "Update $repo/$theme" 2 "Uninstall $repo/$theme")
-                    cmd=(dialog --backtitle "$__backtitle" --menu "Choose an option for theme" 12 40 06)
+                    options=(1 "Update $name" 2 "Uninstall $name")
+                    cmd=(dialog --backtitle "$__backtitle" --menu "Choose an option for theme" 12 60 06)
                     local choice=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
                     case "$choice" in
                         1)
-                            rp_callModule esthemes install_theme "$theme" "$repo"
+                            rp_callModule esthemes install_theme "$theme" "$repo" "$branch"
                             ;;
                         2)
-                            rp_callModule esthemes uninstall_theme "$theme"
+                            rp_callModule esthemes uninstall_theme "$theme_dir"
                             ;;
                     esac
                 else
-                    rp_callModule esthemes install_theme "$theme" "$repo"
+                    rp_callModule esthemes install_theme "$theme" "$repo" "$branch"
                 fi
                 ;;
         esac