From 33f8e1332458597c92e2a9cd77b61c8b09899302 Mon Sep 17 00:00:00 2001
From: the-sane <3657071+the-sane@users.noreply.github.com>
Date: Thu, 9 Oct 2025 18:20:36 -0400
Subject: [PATCH 1/5] Add function comment, reorder function
---
lug-helper.sh | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/lug-helper.sh b/lug-helper.sh
index 296e755..12a2aab 100755
--- a/lug-helper.sh
+++ b/lug-helper.sh
@@ -2894,16 +2894,6 @@ get_current_runner() {
fi
}
-# MARK: format_urls()
-# Format some URLs for Zenity
-format_urls() {
- if [ "$use_zenity" -eq 1 ]; then
- releases_url="$releases_url"
- lug_wiki="$lug_wiki"
- lug_wiki_nixos="$lug_wiki_nixos"
- fi
-}
-
# MARK: set_latest_rsi_installer()
# Fetch and store variables for the latest RSI installer filename and url
set_latest_rsi_installer() {
@@ -2934,6 +2924,8 @@ set_latest_default_runner() {
default_runner_source=0
}
+# MARK: set_latest_winetricks()
+# Fetch and store variables for the latest winetricks download urls
set_latest_winetricks() {
# Winetricks download url
winetricks_version="$(get_latest_release Winetricks/winetricks)"
@@ -2955,6 +2947,16 @@ get_latest_release() {
sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value
}
+# MARK: format_urls()
+# Format some URLs for Zenity
+format_urls() {
+ if [ "$use_zenity" -eq 1 ]; then
+ releases_url="$releases_url"
+ lug_wiki="$lug_wiki"
+ lug_wiki_nixos="$lug_wiki_nixos"
+ fi
+}
+
# MARK: referral_randomizer()
# Get a random Penguin's Star Citizen referral code
referral_randomizer() {
From 3a45df7b1a12b14a8aae29e1d0658df654071d69 Mon Sep 17 00:00:00 2001
From: the-sane <3657071+the-sane@users.noreply.github.com>
Date: Fri, 10 Oct 2025 11:38:25 -0400
Subject: [PATCH 2/5] Update nixos wiki link
---
lug-helper.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lug-helper.sh b/lug-helper.sh
index 12a2aab..301132e 100755
--- a/lug-helper.sh
+++ b/lug-helper.sh
@@ -177,7 +177,7 @@ memory_combined_required="40"
lug_wiki="https://wiki.starcitizen-lug.org"
# NixOS section in Wiki
-lug_wiki_nixos="https://wiki.starcitizen-lug.org/Tips-and-Tricks#nixos"
+lug_wiki_nixos="https://wiki.starcitizen-lug.org/Alternative-Installations#nix-installation"
# RSI Installer version and url
rsi_installer_base_url="https://install.robertsspaceindustries.com/rel/2"
From 5724c8007f159202eb237e39d828ad1400f94b7b Mon Sep 17 00:00:00 2001
From: the-sane <3657071+the-sane@users.noreply.github.com>
Date: Fri, 10 Oct 2025 19:10:30 -0400
Subject: [PATCH 3/5] Display currently in-use runner in the menus
---
lug-helper.sh | 38 ++++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/lug-helper.sh b/lug-helper.sh
index 301132e..2149a3c 100755
--- a/lug-helper.sh
+++ b/lug-helper.sh
@@ -1166,6 +1166,11 @@ download_manage() {
# Initialize success
unset post_download_required
+ # Set variables for the current wine runner configured in the launch script
+ if [ "$download_type" = "runner" ]; then
+ get_current_runner
+ fi
+
# Loop through the download_sources array and create a menu item
# for each one. Even numbered elements will contain the item name
for (( i=0; i<"${#download_sources[@]}"; i=i+2 )); do
@@ -1398,7 +1403,9 @@ download_select_install() {
# Build the menu item
unset menu_option_text
- if [ -d "${download_dir}/${download_basename}" ]; then
+ if [ -d "${download_dir}/${download_basename}" ] && [ "$download_type" = "runner" ] && [ "$current_runner_basename" = "$download_basename" ]; then
+ menu_option_text="$download_basename [in-use]"
+ elif [ -d "${download_dir}/${download_basename}" ]; then
menu_option_text="$download_basename [installed]"
else
# The file is not installed
@@ -1657,7 +1664,18 @@ download_select_delete() {
# Create menu options for the installed items
for (( i=0; i<"${#installed_items[@]}"; i++ )); do
- menu_options+=("${installed_item_names[i]}")
+ # Build the menu item
+ unset menu_option_text
+ # Special handling for runners currently in use
+ if [ "$download_type" = "runner" ] && [ "$current_runner_basename" = "${installed_item_names[i]}" ]; then
+ menu_option_text="${installed_item_names[i]} [in-use]"
+ else
+ # Everything else
+ menu_option_text="${installed_item_names[i]}"
+ fi
+
+
+ menu_options+=("$menu_option_text")
menu_actions+=("download_delete $i")
done
@@ -1721,11 +1739,6 @@ download_delete() {
done
if message question "Are you sure you want to delete the following ${download_type}(s)?\n$list_to_delete"; then
- # Get the current wine runner from the launch script
- get_current_runner
- if [ "$?" -ne 1 ]; then
- current_runner_path="$(dirname "$launcher_winepath")"
- fi
unset post_delete_required
@@ -1735,7 +1748,7 @@ download_delete() {
debug_print continue "Deleted ${installed_items[${item_to_delete[i]}]}"
# If we just deleted the currently used runner, we need to trigger post-delete to update the launch script
- if [ "${installed_items[${item_to_delete[i]}]}" = "$current_runner_path" ]; then
+ if [ "$download_type" = "runner" ] && [ "${installed_items[${item_to_delete[i]}]}" = "$current_runner_path" ]; then
post_delete_required="true"
fi
@@ -1808,7 +1821,7 @@ post_download() {
fi
# We handle installs and deletions differently
- if [ "$post_download_required" = "installed" ]; then
+ if [ "$post_download_required" = "installed" ] && [ "$download_type" = "runner" ]; then
# We are installing a wine version and updating the launch script to use it
# Replace the specified variable in the launch script
@@ -1817,7 +1830,7 @@ post_download() {
# Display a confirmation message
message info "Wine Runner installation complete!"
- elif [ "$post_download_required" = "deleted" ]; then
+ elif [ "$post_download_required" = "deleted" ] && [ "$download_type" = "runner" ]; then
# We deleted a custom wine version and need to revert the launch script to use the default wine runner
# Check if the default wine runner is installed
@@ -2892,6 +2905,11 @@ get_current_runner() {
message warning "Unable to find the current wine runner in your launch script!\n$wine_prefix/$wine_launch_script_name"
return 1
fi
+
+ # Remove the last /bin directory from the path to get the runner directory
+ current_runner_path="$(dirname "$launcher_winepath")"
+ # Get the runner filename, not including its file extension
+ current_runner_basename="$(basename "$current_runner_path")"
}
# MARK: set_latest_rsi_installer()
From c640b3a453806c21c1dd073e20ef9f7a7f1701c1 Mon Sep 17 00:00:00 2001
From: the-sane <3657071+the-sane@users.noreply.github.com>
Date: Sun, 12 Oct 2025 23:42:15 -0400
Subject: [PATCH 4/5] Include license info
---
lib/sc-launch.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/sc-launch.sh b/lib/sc-launch.sh
index 5b5178b..0749be2 100755
--- a/lib/sc-launch.sh
+++ b/lib/sc-launch.sh
@@ -6,7 +6,8 @@
# Usage:
# Run from your terminal or use the .desktop files installed by the Helper.
#
-# version: 2.2
+# version: 2.3
+# License: GPLv3.0
############################################################################
# ENVIRONMENT VARIABLES
From 3a6c1aaf78f14834a6673e613b64be43ad87dbdb Mon Sep 17 00:00:00 2001
From: the-sane <3657071+the-sane@users.noreply.github.com>
Date: Fri, 17 Oct 2025 14:33:56 -0400
Subject: [PATCH 5/5] unset sdl_videodriver by default
---
lib/sc-launch.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/sc-launch.sh b/lib/sc-launch.sh
index 0749be2..4cfed9a 100755
--- a/lib/sc-launch.sh
+++ b/lib/sc-launch.sh
@@ -6,7 +6,7 @@
# Usage:
# Run from your terminal or use the .desktop files installed by the Helper.
#
-# version: 2.3
+# version: 2.4
# License: GPLv3.0
############################################################################
@@ -19,6 +19,8 @@
export WINEPREFIX="$HOME/Games/star-citizen"
launch_log="$WINEPREFIX/sc-launch.log"
+unset SDL_VIDEODRIVER
+
export WINEDLLOVERRIDES=winemenubuilder.exe=d # Prevent updates from overwriting our .desktop entries
export WINEDEBUG=-all # Cut down on console debug messages
# Nvidia cache options