diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index c7cb477..5ff8363 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -429,20 +429,6 @@ function showAppInstallMenu () { done } -# -# show menu to install beta apps from different categories -# -function showAppBetaInstallMenu () { - installBetaMenu -} - -# -# show menu to install nightly apps from different categories -# -function showAppNightlyInstallMenu () { - installNightlyMenu -} - # # show menu about install/config hardware # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index f088609..8147c22 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -384,11 +384,7 @@ sqlparse;pip;atom;sqlparse flake8;pip;atom;flake8 autopep8;pip;atom;autopep8 htmlbeautifier;gem;atom;htmlbeautifier -kodi;apt;beta;kodi-beta -kodi;apt;nightly;kodi-nightly nitrogen;apt;nitrogen;nitrogen -firefox-trunk;apt;nightly;firefox-trunk -firefox-trunk-locale-fr;apt;nightly;firefox-trunk-locale-fr libreoffice;apt;office;libreoffice6 winehq-stable;apt;wine;winehq-stable winetricks;apt;wine;winetricks diff --git a/yggdrasil.sh b/yggdrasil.sh index ab64b63..1ace2cb 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -308,17 +308,15 @@ mainMenuOptions=$(whiptail \ 25 80 16 \ "1" "System update" \ "2" "Applications" \ -"3" "Applications (BETA)" \ -"4" "Applications (Nightly)" \ -"5" "Themes & Icons" \ -"6" "Dev Apps" \ -"7" "System Config" \ -"8" "Hardware" \ -"9" "System Tools" \ -"10" "Add Makoto no Blog repository" \ -"11" "Reboot this computer" \ -"12" "About Yggdrasil" \ -"13" "Quit" 3>&1 1>&2 2>&3) +"3" "Themes & Icons" \ +"4" "Dev Apps" \ +"5" "System Config" \ +"6" "Hardware" \ +"7" "System Tools" \ +"8" "Add Makoto no Blog repository" \ +"9" "Reboot this computer" \ +"10" "About Yggdrasil" \ +"11" "Quit" 3>&1 1>&2 2>&3) case $mainMenuOptions in "1") @@ -329,36 +327,30 @@ case $mainMenuOptions in showAppInstallMenu ;; "3") - installAppsFromListMenu beta - ;; - "4") - installAppsFromListMenu nightly - ;; - "5") showThemesInstallMenu ;; - "6") + "4") showDevInstallMenu ;; - "7") + "5") showConfigMenu; ;; - "8") + "6") showHardwareMenu ;; - "9") + "7") showSysToolsMenu ;; - "10") + "8") addRepo_Makoto ;; - "11") + "9") showRebootBoxMenu ;; - "12") + "10") showAboutBoxMenu ;; - "13") + "11") exit ;; esac # main menu