Fixes and remove debug code

This commit is contained in:
the-sane 2020-08-11 22:02:44 -04:00 committed by GitHub
parent c45b974f43
commit 0b735a1882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -29,14 +29,11 @@ backup_conf="backupdir.conf"
# Use the XDG config directory if defined # Use the XDG config directory if defined
if [ -z "$XDG_CONFIG_HOME" ]; then if [ -z "$XDG_CONFIG_HOME" ]; then
conf_dir="$HOME/.config" conf_dir="$HOME/.config"
echo "DEBUG: XDG DIR NOT FOUND"
else else
conf_dir="$XDG_CONFIG_HOME" conf_dir="$XDG_CONFIG_HOME"
echo "DEBUG: XDG DIR FOUND"
fi fi
conf_subdir="starcitizen-lug" conf_subdir="starcitizen-lug"
############################################################################ ############################################################################
############################################################################ ############################################################################
@ -89,8 +86,7 @@ message() {
elif [ "$1" -eq 3 ]; then elif [ "$1" -eq 3 ]; then
# question # question
echo -e "$2" echo -e "$2"
while true; do while read -p "[y/n]: " yn; do
read -p "[y/n]: " yn
case "$yn" in case "$yn" in
[Yy]*) [Yy]*)
return 0 return 0
@ -124,58 +120,70 @@ getdirs() {
# Check if the config files already exist # Check if the config files already exist
if [ -f "$conf_dir/$conf_subdir/$wine_conf" ]; then if [ -f "$conf_dir/$conf_subdir/$wine_conf" ]; then
found_wine_conf=1
wine_prefix="$(cat "$conf_dir/$conf_subdir/$wine_conf")" wine_prefix="$(cat "$conf_dir/$conf_subdir/$wine_conf")"
fi fi
if [ -f "$conf_dir/$conf_subdir/$game_conf" ]; then if [ -f "$conf_dir/$conf_subdir/$game_conf" ]; then
found_game_conf=1
game_path="$(cat "$conf_dir/$conf_subdir/$game_conf")" game_path="$(cat "$conf_dir/$conf_subdir/$game_conf")"
fi fi
if [ -f "$conf_dir/$conf_subdir/$backup_conf" ]; then if [ -f "$conf_dir/$conf_subdir/$backup_conf" ]; then
found_backup_conf=1
backup_path="$(cat "$conf_dir/$conf_subdir/$backup_conf")" backup_path="$(cat "$conf_dir/$conf_subdir/$backup_conf")"
fi fi
if [ -z "$found_wine_config" ] || [ -z "$found_game_conf" ] || [ -z "$found_backup_conf" ]; then if [ -z "$wine_prefix" ] || [ -z "$game_path" ] || [ -z "$backup_path" ]; then
message 1 "You will now be asked to provide some directories needed by this script.\nThey will be saved for later use in:\n$conf_dir/$conf_subdir/" message 1 "You will now be asked to provide some directories needed by this script.\n\nThey will be saved for later use in:\n$conf_dir/$conf_subdir/"
if [ "$has_zen" -eq 1 ]; then if [ "$has_zen" -eq 1 ]; then
# Get the wine prefix directory # Get the wine prefix directory
if [ -z "$found_wine_conf" ]; then if [ -z "$wine_prefix" ]; then
wine_prefix="$(zenity --file-selection --directory --title="Select your WINE prefix directory" --filename="$HOME/")" wine_prefix="$(zenity --file-selection --directory --title="Select your WINE prefix directory" --filename="$HOME/.wine")"
if [ "$?" -eq -1 ]; then if [ "$?" -eq -1 ]; then
message 2 "An unexpected error has occurred." message 2 "An unexpected error has occurred."
exit 0
elif [ -z "$wine_prefix" ]; then
# User clicked cancel
message 2 "Operation cancelled. The script will now exit."
exit 0
fi fi
fi fi
# Get the game path # Get the game path
if [ -z "$found_game_conf" ]; then if [ -z "$game_path" ]; then
while true; do while game_path="$(zenity --file-selection --directory --title="Select your Star Citizen LIVE directory" --filename="$wine_prefix/")"; do
game_path="$(zenity --file-selection --directory --title="Select your Star Citizen LIVE directory" --filename="$prefix/")"
if [ "$?" -eq -1 ]; then if [ "$?" -eq -1 ]; then
message 2 "An unexpected error has occurred." message 2 "An unexpected error has occurred."
fi exit 0
elif [ "$(basename "$game_path")" != "LIVE" ]; then
if [ "$(basename "$game_path")" != "LIVE" ]; then
message 2 "You must select your LIVE directory." message 2 "You must select your LIVE directory."
else else
# All good or cancel
break break
fi fi
done done
if [ -z "$game_path" ]; then
# User clicked cancel
message 2 "Operation cancelled. The script will now exit."
exit 0
fi
fi fi
# Get the backup directory # Get the backup directory
if [ -z "$found_backup_conf" ]; then if [ -z "$backup_path" ]; then
backup_path="$(zenity --file-selection --directory --title="Select a backup directory for your keybinds" --filename="$HOME/")" backup_path="$(zenity --file-selection --directory --title="Select a backup directory for your keybinds" --filename="$HOME/")"
if [ "$?" -eq -1 ]; then if [ "$?" -eq -1 ]; then
message 2 "An unexpected error has occurred." message 2 "An unexpected error has occurred."
exit 0
elif [ -z "$backup_path" ]; then
# User clicked cancel
message 2 "Operation cancelled. The script will now exit."
exit 0
fi fi
fi fi
else else
clear clear
# Get the wine prefix directory # Get the wine prefix directory
if [ -z "$found_wine_conf" ]; then if [ -z "$wine_prefix" ]; then
echo -e "Enter the full path to your WINE prefix directory" echo -e "Enter the full path to your WINE prefix directory (case sensitive)"
echo -e "ie. /home/USER/.wine/" echo -e "ie. /home/USER/.wine/"
while read -rp ": " wine_prefix; do while read -rp ": " wine_prefix; do
if [ ! -d "$wine_prefix" ]; then if [ ! -d "$wine_prefix" ]; then
@ -186,8 +194,8 @@ getdirs() {
done done
# Get the game path # Get the game path
if [ -z "$found_game_conf" ]; then if [ -z "$game_path" ]; then
echo -e "\nEnter the full path to your Star Citizen installation LIVE directory" echo -e "\nEnter the full path to your Star Citizen installation LIVE directory\n(case sensitive)"
echo -e "ie. /home/USER/.wine/drive_c/Program Files/Roberts Space Industries/Star Citizen/LIVE/" echo -e "ie. /home/USER/.wine/drive_c/Program Files/Roberts Space Industries/Star Citizen/LIVE/"
while read -rp ": " game_path; do while read -rp ": " game_path; do
if [ ! -d "$game_path" ]; then if [ ! -d "$game_path" ]; then
@ -201,8 +209,8 @@ getdirs() {
fi fi
# Get the backup directory # Get the backup directory
if [ -z "$found_backup_conf" ]; then if [ -z "$backup_path" ]; then
echo -e "\nEnter the full path to a backup directory for your keybinds" echo -e "\nEnter the full path to a backup directory for your keybinds (case sensitive)"
echo -e "ie. /home/USER/backups/" echo -e "ie. /home/USER/backups/"
while read -rp ": " backup_path; do while read -rp ": " backup_path; do
if [ ! -d "$backup_path" ]; then if [ ! -d "$backup_path" ]; then
@ -248,19 +256,19 @@ sanitize() {
# Back up keybinds # Back up keybinds
if [ "$exported" -eq 1 ]; then if [ "$exported" -eq 1 ]; then
echo "Backing up all saved keybinds..." echo "Backing up all saved keybinds..."
mkdir -p "$backup_path" && cp -r "$mappings_dir/." "$backup_path/" mkdir -p "$backup_path" && cp -r "$mappings_dir/." "$backup_path/keybinds/"
echo -e "Done.\n" echo -e "Done.\n"
fi fi
# Wipe the user directory # Wipe the user directory
echo "Wiping USER directory..." echo "Wiping USER directory..."
rm -rf "$user_dir" mv "$user_dir" "$backup_path/userbackup"
echo -e "Done.\n" echo -e "Done.\n"
# Restore custom keybinds # Restore custom keybinds
if [ "$exported" -eq 1 ]; then if [ "$exported" -eq 1 ]; then
echo "Restoring keybinds..." echo "Restoring keybinds..."
mkdir -p "$mappings_dir" && cp -r "$backup_path/." "$mappings_dir/" mkdir -p "$mappings_dir" && cp -r "$backup_path/keybinds/" "$mappings_dir/"
echo -e "Done.\n" echo -e "Done.\n"
message 1 "\nTo re-import your keybinds, select it in-game from the list:\nOptions->Keybindings->Control Profiles\n" message 1 "\nTo re-import your keybinds, select it in-game from the list:\nOptions->Keybindings->Control Profiles\n"
fi fi
@ -378,14 +386,14 @@ clear
# Check if Zenity is available # Check if Zenity is available
has_zen=0 has_zen=0
if [ -x "$(command -v zenity)" ]; then if [ -x "$(command -v zenity)" ]; then
has_zen=0 has_zen=1
fi fi
# Use Zenity if it is available # Use Zenity if it is available
if [ "$has_zen" -eq 1 ]; then if [ "$has_zen" -eq 1 ]; then
check="Check vm.max_map_count for optimal performance" check="Check vm.max_map_count for optimal performance"
clean="Delete my USER folder and preserve my keybinds" clean="Delete my USER folder and preserve my keybinds"
list=("TRUE" "$check" "FALSE" "$clean" "FALSE" "test") list=("TRUE" "$check" "FALSE" "$clean")
options="$(message 5 "${list[@]}")" options="$(message 5 "${list[@]}")"
case "$options" in case "$options" in
@ -395,12 +403,6 @@ if [ "$has_zen" -eq 1 ]; then
"$clean") "$clean")
sanitize sanitize
;; ;;
"test")
getdirs
echo "$prefix"
echo "$path"
echo "$backups"
;;
*) *)
;; ;;
esac esac
@ -424,14 +426,6 @@ else
sanitize sanitize
break break
;; ;;
"3")
echo -e "\n"
getdirs
echo "$prefix"
echo "$path"
echo "$backups"
break
;;
"q") "q")
break break
;; ;;