From af640e3f8071e8d3d24c73d38aca101b8a7873f6 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Wed, 26 Jun 2024 09:56:01 +0200 Subject: [PATCH] lime3ds install + init --- functions/jsonToBashVars.sh | 2 ++ setup.sh | 8 ++++++++ test.sh | 30 ++++++++++-------------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/functions/jsonToBashVars.sh b/functions/jsonToBashVars.sh index a6271daa..8d323574 100644 --- a/functions/jsonToBashVars.sh +++ b/functions/jsonToBashVars.sh @@ -11,6 +11,7 @@ function jsonToBashVars(){ setSetting doInstallYuzu "$(jq .installEmus.yuzu.status $json)" setSetting doInstallSuyu "$(jq .installEmus.suyu.status $json)" setSetting doInstallCitra "$(jq .installEmus.citra.status $json)" + setSetting doInstallLime3DS "$(jq .installEmus.lime3ds.status $json)" setSetting doInstallDuck "$(jq .installEmus.duckstation.status $json)" setSetting doInstallCemu "$(jq .installEmus.cemu.status $json)" setSetting doInstallXenia "$(jq .installEmus.xenia.status $json)" @@ -41,6 +42,7 @@ function jsonToBashVars(){ setSetting doSetupYuzu "$(jq .overwriteConfigEmus.yuzu.status $json)" setSetting doSetupSuyu "$(jq .overwriteConfigEmus.suyu.status $json)" setSetting doSetupCitra "$(jq .overwriteConfigEmus.citra.status $json)" + setSetting doSetupLime3DS "$(jq .overwriteConfigEmus.lime3ds.status $json)" setSetting doSetupDuck "$(jq .overwriteConfigEmus.duckstation.status $json)" setSetting doSetupCemu "$(jq .overwriteConfigEmus.cemu.status $json)" setSetting doSetupXenia "$(jq .overwriteConfigEmus.xenia.status $json)" diff --git a/setup.sh b/setup.sh index db29882c..b981ee9e 100644 --- a/setup.sh +++ b/setup.sh @@ -189,6 +189,10 @@ if [ $doInstallCitra == "true" ]; then echo "install Citra" Citra_install fi +if [ $doInstallLime3DS == "true" ]; then + echo "install Lime3DS" + Lime3DS_install +fi if [ $doInstallDolphin == "true" ]; then echo "install Dolphin" Dolphin_install @@ -336,6 +340,10 @@ if [ "$doSetupCitra" == "true" ]; then echo "Citra_init" Citra_init fi +if [ $doSetupLime3DS == "true" ]; then + echo "Lime3DS_init" + Lime3DS_init +fi if [ "$doSetupDuck" == "true" ]; then echo "DuckStation_init" DuckStation_init diff --git a/test.sh b/test.sh index 1e0bc878..3b9c3405 100644 --- a/test.sh +++ b/test.sh @@ -1,22 +1,12 @@ #!/bin/bash +. $HOME/.config/EmuDeck/backend/functions/all.sh -user=$(zenity --entry --title="ScreenScrapper" --text="User:") -password=$(zenity --password --title="ScreenScrapper" --text="Password:") - -encryption_key=$(openssl rand -base64 32) -encrypted_password=$(echo "$password" | openssl enc -aes-256-cbc -pbkdf2 -base64 -pass "pass:$encryption_key") - -echo "$encryption_key" > "$HOME/.config/EmuDeck/logs/.key" -echo "$encrypted_password" > "$HOME/.config/EmuDeck/.passSS" -echo "$user" > "$HOME/.config/EmuDeck/.userSS" - - -############# - -encryption_key=$(cat "$HOME/.config/EmuDeck/logs/.key") - -encrypted_password=$(cat "$HOME/.config/EmuDeck/.passSS") - -decrypted_password=$(echo "$encrypted_password" | openssl enc -d -aes-256-cbc -pbkdf2 -base64 -pass "pass:$encryption_key") - -echo $decrypted_password +Lime3DS_IsInstalled(){ + if [ -e "$Lime3DS_emuPath" ]; then + echo "true" + else + echo "false" + fi +} +echo $Lime3DS_emuPath +Lime3DS_IsInstalled \ No newline at end of file