Skip to content

Commit 56fe955

Browse files
dragoonDorisedragoonDorise
committed
Merge branch 'dev' of https://github.com/dragoonDorise/EmuDeck into dev
2 parents f5aafe7 + 9a9c9f9 commit 56fe955

19 files changed

+347
-289
lines changed

‎functions/GenericApplicationsScripts/genericApplicationBottles.sh

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
3+
# genericApplicationBottles
24

35
# Variables
46
Bottles_emuName="Bottles"
5-
Bottles_emuType="$emuDeckEmuTypeFlatpak"
7+
# shellcheck disable=2034,2154
8+
Bottles_emuType="${emuDeckEmuTypeFlatpak}"
69
Bottles_emuPath="com.usebottles.bottles"
10+
# shellcheck disable=2034
711
Bottles_releaseURL=""
812

913
# Install
10-
Bottles_install() {
11-
setMSG "Installing $Bottles_emuName."
14+
Bottles_install () {
15+
setMSG "Installing ${Bottles_emuName}."
1216
installEmuFP "${Bottles_emuName}" "${Bottles_emuPath}" "genericapplication" ""
1317
}
1418

1519
# ApplyInitialSettings
16-
Bottles_init() {
17-
setMSG "Initializing $Bottles_emuName settings."
18-
configEmuFP "$Bottles_emuName" "$Bottles_emuPath" "true"
20+
Bottles_init () {
21+
setMSG "Initializing ${Bottles_emuName} settings."
22+
configEmuFP "${Bottles_emuName}" "${Bottles_emuPath}" "true"
1923
}
2024

2125
# Update flatpak & launcher script
22-
Bottles_update() {
23-
setMSG "Updating $Bottles_emuName settings."
26+
Bottles_update () {
27+
setMSG "Updating ${Bottles_emuName} settings."
2428
updateEmuFP "${Bottles_emuName}" "${Bottles_emuPath}" "genericapplication" ""
2529
}
2630

2731
# Uninstall
28-
Bottles_uninstall() {
29-
setMSG "Uninstalling $Bottles_emuName."
30-
uninstallEmuFP "$Bottles_emuName" "$Bottles_emuPath" "genericapplication" ""
32+
Bottles_uninstall () {
33+
setMSG "Uninstalling ${Bottles_emuName}."
34+
uninstallEmuFP "${Bottles_emuName}" "${Bottles_emuPath}" "genericapplication" ""
3135
}
3236

3337
# Check if installed
34-
Bottles_IsInstalled() {
35-
if [ "$(flatpak --columns=app list | grep "$Bottles_emuPath")" == "$Bottles_emuPath" ]; then
38+
Bottles_IsInstalled () {
39+
if [ "$(flatpak --columns=app list | grep "${Bottles_emuPath}")" == "${Bottles_emuPath}" ]; then
3640
echo true
3741
return 1
3842
else
@@ -42,6 +46,6 @@ Bottles_IsInstalled() {
4246
}
4347

4448
# Import steam profile
45-
Bottles_addSteamInputProfile() {
49+
Bottles_addSteamInputProfile () {
4650
echo "NYI"
4751
}

‎functions/GenericApplicationsScripts/genericApplicationCider.sh

+18-15
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
3+
# genericApplicationCider
24

35
# Variables
46
Cider_emuName="Cider"
5-
Cider_emuType="$emuDeckEmuTypeFlatpak"
7+
# shellcheck disable=2034,2154
8+
Cider_emuType="${emuDeckEmuTypeFlatpak}"
69
Cider_emuPath="sh.cider.Cider"
710

811
# Install
9-
Cider_install() {
10-
setMSG "Installing $Cider_emuName."
12+
Cider_install () {
13+
setMSG "Installing ${Cider_emuName}."
1114
installEmuFP "${Cider_emuName}" "${Cider_emuPath}" "genericapplication" ""
1215
}
1316

1417
# ApplyInitialSettings
15-
Cider_init() {
16-
setMSG "Initializing $Cider_emuName settings."
17-
configEmuFP "$Cider_emuName" "$Cider_emuPath" "true"
18+
Cider_init () {
19+
setMSG "Initializing ${Cider_emuName} settings."
20+
configEmuFP "${Cider_emuName}" "${Cider_emuPath}" "true"
1821
}
1922

2023
# Update flatpak & launcher script
21-
Cider_update() {
22-
setMSG "Updating $Cider_emuName settings."
24+
Cider_update () {
25+
setMSG "Updating ${Cider_emuName} settings."
2326
updateEmuFP "${Cider_emuName}" "${Cider_emuPath}" "genericapplication" ""
2427
}
2528

2629
# Uninstall
27-
Cider_uninstall() {
28-
setMSG "Uninstalling $Cider_emuName."
29-
uninstallEmuFP "$Cider_emuName" "$Cider_emuPath" "genericapplication" ""
30+
Cider_uninstall () {
31+
setMSG "Uninstalling ${Cider_emuName}."
32+
uninstallEmuFP "${Cider_emuName}" "${Cider_emuPath}" "genericapplication" ""
3033
}
3134

3235
# Check if installed
33-
Cider_IsInstalled() {
34-
if [ "$(flatpak --columns=app list | grep "$Cider_emuPath")" == "$Cider_emuPath" ]; then
36+
Cider_IsInstalled () {
37+
if [ "$(flatpak --columns=app list | grep "${Cider_emuPath}")" == "${Cider_emuPath}" ]; then
3538
echo true
3639
return 1
3740
else
@@ -41,7 +44,7 @@ Cider_IsInstalled() {
4144
}
4245

4346
# Import steam profile
44-
Cider_addSteamInputProfile() {
47+
Cider_addSteamInputProfile () {
4548
echo "NYI"
4649
#rsync -r "$emudeckBackend/configs/steam-input/emudeck_Cider_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/"
4750
}

‎functions/GenericApplicationsScripts/genericApplicationFlatseal.sh

+19-15
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
3+
# genericApplicationFlatseal
24

35
# Variables
46
Flatseal_emuName="Flatseal"
5-
Flatseal_emuType="$emuDeckEmuTypeFlatpak"
7+
# shellcheck disable=2034,2154
8+
Flatseal_emuType="${emuDeckEmuTypeFlatpak}"
69
Flatseal_emuPath="com.github.tchx84.Flatseal"
10+
# shellcheck disable=2034
711
Flatseal_releaseURL=""
812

913
# Install
10-
Flatseal_install() {
11-
setMSG "Installing $Flatseal_emuName."
14+
Flatseal_install () {
15+
setMSG "Installing ${Flatseal_emuName}."
1216
installEmuFP "${Flatseal_emuName}" "${Flatseal_emuPath}" "genericapplication" ""
1317
}
1418

1519
# ApplyInitialSettings
16-
Flatseal_init() {
17-
setMSG "Initializing $Flatseal_emuName settings."
18-
configEmuFP "$Flatseal_emuName" "$Flatseal_emuPath" "true"
20+
Flatseal_init () {
21+
setMSG "Initializing ${Flatseal_emuName} settings."
22+
configEmuFP "${Flatseal_emuName}" "${Flatseal_emuPath}" "true"
1923
}
2024

2125
# Update flatpak & launcher script
22-
Flatseal_update() {
23-
setMSG "Updating $Flatseal_emuName settings."
26+
Flatseal_update () {
27+
setMSG "Updating ${Flatseal_emuName} settings."
2428
updateEmuFP "${Flatseal_emuName}" "${Flatseal_emuPath}" "genericapplication" ""
2529
}
2630

2731
# Uninstall
28-
Flatseal_uninstall() {
29-
setMSG "Uninstalling $Flatseal_emuName."
30-
uninstallEmuFP "$Flatseal_emuName" "$Flatseal_emuPath" "genericapplication" ""
32+
Flatseal_uninstall () {
33+
setMSG "Uninstalling ${Flatseal_emuName}."
34+
uninstallEmuFP "${Flatseal_emuName}" "${Flatseal_emuPath}" "genericapplication" ""
3135
}
3236

3337
# Check if installed
34-
Flatseal_IsInstalled() {
35-
if [ "$(flatpak --columns=app list | grep "$Flatseal_emuPath")" == "$Flatseal_emuPath" ]; then
38+
Flatseal_IsInstalled () {
39+
if [ "$(flatpak --columns=app list | grep "${Flatseal_emuPath}")" == "${Flatseal_emuPath}" ]; then
3640
echo true
3741
return 1
3842
else
@@ -42,6 +46,6 @@ Flatseal_IsInstalled() {
4246
}
4347

4448
# Import steam profile
45-
Flatseal_addSteamInputProfile() {
49+
Flatseal_addSteamInputProfile () {
4650
echo "NYI"
4751
}

‎functions/GenericApplicationsScripts/genericApplicationHeroic.sh

+22-17
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
3+
# genericApplicationHeroic
24

35
# Variables
46
Heroic_emuName="Heroic-Games-Launcher"
5-
Heroic_emuType="$emuDeckEmuTypeAppImage"
6-
Heroic_emuPath="$emusFolder/Heroic-Games-Launcher.AppImage"
7+
# shellcheck disable=2034,2154
8+
Heroic_emuType="${emuDeckEmuTypeAppImage}"
9+
# shellcheck disable=2154
10+
Heroic_emuPath="${emusFolder}/Heroic-Games-Launcher.AppImage"
711

812
# Install
9-
Heroic_install() {
10-
setMSG "Installing $Heroic_emuName."
13+
# shellcheck disable=2120
14+
Heroic_install () {
15+
setMSG "Installing ${Heroic_emuName}."
1116

12-
local showProgress=$1
13-
installEmuAI "$Heroic_emuName" "" "$(getReleaseURLGH "Heroic-Games-Launcher/HeroicGamesLauncher" ".AppImage")" "" "" "genericapplication" "$showProgress"
17+
local showProgress="${1}"
18+
installEmuAI "${Heroic_emuName}" "" "$( getReleaseURLGH "Heroic-Games-Launcher/HeroicGamesLauncher" ".AppImage" )" "" "" "genericapplication" "${showProgress}"
1419
}
1520

1621
# ApplyInitialSettings
17-
Heroic_init() {
22+
Heroic_init () {
1823
echo "NYI"
1924
}
2025

2126
# Update appimage
22-
Heroic_update() {
23-
setMSG "Updating $Heroic_emuName settings."
24-
rm -f "$Heroic_emuPath"
27+
Heroic_update () {
28+
setMSG "Updating ${Heroic_emuName} settings."
29+
rm -f "${Heroic_emuPath}"
2530
Heroic_install
2631
}
2732

2833
# Uninstall
29-
Heroic_uninstall() {
30-
setMSG "Uninstalling $Heroic_emuName."
31-
uninstallEmuAI "$Heroic_emuName" "" "" "genericapplication"
34+
Heroic_uninstall () {
35+
setMSG "Uninstalling ${Heroic_emuName}."
36+
uninstallEmuAI "${Heroic_emuName}" "" "" "genericapplication"
3237
}
3338

3439
# Check if installed
35-
Heroic_IsInstalled() {
36-
if [ -f "$Heroic_emuPath" ]; then
40+
Heroic_IsInstalled () {
41+
if [ -f "${Heroic_emuPath}" ]; then
3742
echo true
3843
return 1
3944
else
@@ -43,6 +48,6 @@ Heroic_IsInstalled() {
4348
}
4449

4550
# Import steam profile
46-
Heroic_addSteamInputProfile() {
51+
Heroic_addSteamInputProfile () {
4752
echo "NYI"
4853
}

‎functions/GenericApplicationsScripts/genericApplicationLutris.sh

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
3+
# genericApplicationLutris
24

35
# Variables
46
Lutris_emuName="Lutris"
5-
Lutris_emuType="$emuDeckEmuTypeFlatpak"
7+
# shellcheck disable=2034,2154
8+
Lutris_emuType="${emuDeckEmuTypeFlatpak}"
69
Lutris_emuPath="net.lutris.Lutris"
10+
# shellcheck disable=2034
711
Lutris_releaseURL=""
812

913
# Install
10-
Lutris_install() {
14+
Lutris_install () {
1115
setMSG "Installing $Lutris_emuName."
1216
installEmuFP "${Lutris_emuName}" "${Lutris_emuPath}" "genericapplication" ""
1317
}
1418

1519
# ApplyInitialSettings
16-
Lutris_init() {
20+
Lutris_init () {
1721
setMSG "Initializing $Lutris_emuName settings."
1822
configEmuFP "$Lutris_emuName" "$Lutris_emuPath" "true"
1923
}
2024

2125
# Update flatpak & launcher script
22-
Lutris_update() {
26+
Lutris_update () {
2327
setMSG "Updating $Lutris_emuName settings."
2428
updateEmuFP "${Lutris_emuName}" "${Lutris_emuPath}" "genericapplication" ""
2529
}
2630

2731
# Uninstall
28-
Lutris_uninstall() {
32+
Lutris_uninstall () {
2933
setMSG "Uninstalling $Lutris_emuName."
3034
uninstallEmuFP "$Lutris_emuName" "$Lutris_emuPath" "genericapplication" ""
3135
}
3236

3337
# Check if installed
34-
Lutris_IsInstalled() {
38+
Lutris_IsInstalled () {
3539
if [ "$(flatpak --columns=app list | grep "$Lutris_emuPath")" == "$Lutris_emuPath" ]; then
3640
echo true
3741
return 1
@@ -42,6 +46,6 @@ Lutris_IsInstalled() {
4246
}
4347

4448
# Import steam profile
45-
Lutris_addSteamInputProfile() {
49+
Lutris_addSteamInputProfile () {
4650
echo "NYI"
4751
}

‎functions/GenericApplicationsScripts/genericApplicationPlexamp.sh

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
3+
# genericApplicationPlexamp
24

35
# Variables
46
Plexamp_emuName="Plexamp"
@@ -7,32 +9,32 @@ Plexamp_emuPath="com.plexamp.Plexamp"
79
Plexamp_releaseURL=""
810

911
# Install
10-
Plexamp_install() {
11-
setMSG "Installing $Plexamp_emuName."
12+
Plexamp_install () {
13+
setMSG "Installing ${Plexamp_emuName}."
1214
installEmuFP "${Plexamp_emuName}" "${Plexamp_emuPath}" "genericapplication" ""
1315
}
1416

1517
# ApplyInitialSettings
16-
Plexamp_init() {
17-
setMSG "Initializing $Plexamp_emuName settings."
18-
configEmuFP "$Plexamp_emuName" "$Plexamp_emuPath" "true"
18+
Plexamp_init () {
19+
setMSG "Initializing ${Plexamp_emuName} settings."
20+
configEmuFP "${Plexamp_emuName}" "${Plexamp_emuPath}" "true"
1921
}
2022

2123
# Update flatpak & launcher script
22-
Plexamp_update() {
23-
setMSG "Updating $Plexamp_emuName settings."
24+
Plexamp_update () {
25+
setMSG "Updating ${Plexamp_emuName} settings."
2426
updateEmuFP "${Plexamp_emuName}" "${Plexamp_emuPath}" "genericapplication" ""
2527
}
2628

2729
# Uninstall
28-
Plexamp_uninstall() {
29-
setMSG "Uninstalling $Plexamp_emuName."
30-
uninstallEmuFP "$Plexamp_emuName" "$Plexamp_emuPath" "genericapplication" ""
30+
Plexamp_uninstall () {
31+
setMSG "Uninstalling ${Plexamp_emuName}."
32+
uninstallEmuFP "${Plexamp_emuName}" "${Plexamp_emuPath}" "genericapplication" ""
3133
}
3234

3335
# Check if installed
34-
Plexamp_IsInstalled() {
35-
if [ "$(flatpak --columns=app list | grep "$Plexamp_emuPath")" == "$Plexamp_emuPath" ]; then
36+
Plexamp_IsInstalled () {
37+
if [ "$(flatpak --columns=app list | grep "${Plexamp_emuPath}")" == "${Plexamp_emuPath}" ]; then
3638
echo true
3739
return 1
3840
else
@@ -42,6 +44,6 @@ Plexamp_IsInstalled() {
4244
}
4345

4446
# Import steam profile
45-
Plexamp_addSteamInputProfile() {
47+
Plexamp_addSteamInputProfile () {
4648
echo "NYI"
4749
}

0 commit comments

Comments
 (0)