@@ -115,7 +115,7 @@ function term_exit_handler() {
115
115
# error did not lead to exit but we will exit with non zero indicating error occured
116
116
# otherwise dont alter it
117
117
if [[ $exit_code -eq 0 ]]; then
118
- return 1
118
+ exit 1
119
119
fi
120
120
done
121
121
else
@@ -236,7 +236,7 @@ function __logger_core() {
236
236
;;
237
237
error)
238
238
declare -r lvl_str=" ERROR"
239
- declare -r lvl_sym=" ✖ "
239
+ declare -r lvl_sym=" • "
240
240
declare -r lvl_color=" ${AE_COLOR_RED} "
241
241
;;
242
242
critical)
@@ -410,8 +410,8 @@ function __setup_platform_vars() {
410
410
readonly AE_UBUNTU_CODENAME_LATEST_LTS=" focal"
411
411
readonly AE_UBUNTU_CODENAME_PREV_LTS=" bionic"
412
412
413
- readonly AE_DEBIAN_CODENAME_LATEST=" buster "
414
- readonly AE_DEBIAN_CODENAME_UPCOMING=" bullseye "
413
+ readonly AE_DEBIAN_CODENAME_LATEST=" bullseye "
414
+ readonly AE_DEBIAN_CODENAME_UPCOMING=" bookworm "
415
415
416
416
# ============================ Switches/ booleans & Vars ================================
417
417
@@ -1092,6 +1092,7 @@ function _set_yaml_config() {
1092
1092
_check_bool " AE_RUN_CONFIG_REPO_PROTONVPN" " ${AE_RUN__config__add_repo__protonvpn[0]} "
1093
1093
_check_bool " AE_RUN_CONFIG_REPO_NEURODEBIAN" " ${AE_RUN__config__add_repo__neurodebian[0]} "
1094
1094
_check_bool " AE_RUN_CONFIG_REPO_MINICONDA" " ${AE_RUN__config__add_repo__miniconda[0]} "
1095
+ _check_bool " AE_RUN_CONFIG_REPO_ELEMENT_IO" " ${AE_RUN__config__add_repo__element_io[0]} "
1095
1096
1096
1097
# Debian Components
1097
1098
_check_bool " AE_RUN_CONFIG_REPO_DEBIAN_NONFREE" " ${AE_RUN__config__add_repo__debian_nonfree[0]} "
@@ -1291,7 +1292,7 @@ function _fix_repo_not_available() {
1291
1292
# (may not be LTS) for adding repository
1292
1293
1293
1294
log_debug " Check and apply codename fixes"
1294
- if [ " $AE_RUN_FIX " == " true" ]; then
1295
+ if [[ $AE_RUN_FIX == " true" ]] && [[ $AE_RUN_IS_DEBIAN != " true " ] ]; then
1295
1296
# Check LTS fallback flag is being used
1296
1297
# if running on current LTS, and fix mode is LTS fallback to last LTS.
1297
1298
if [[ $AE_RUN_FIX_MODE_LTS == " true" ]] && [[ $AE_RUN_CODENAME == " ${AE_UBUNTU_CODENAME_LATEST_LTS} " ]]; then
@@ -1303,7 +1304,7 @@ function _fix_repo_not_available() {
1303
1304
elif [[ $AE_RUN_FIX_MODE_LTS != " true" ]] && [[ $AE_RUN_CODENAME == " ${AE_UBUNTU_CODENAME_LATEST} " ]]; then
1304
1305
log_warn " Using previous release ${AE_UBUNTU_CODENAME_PREV} as fallback"
1305
1306
1306
- # fallback is non LTS so it might disapper/become unsupported! warn
1307
+ # fallback is non LTS so it might disapper/become unsupported!
1307
1308
if [[ $AE_UBUNTU_CODENAME_PREV != " $AE_UBUNTU_CODENAME_LATEST_LTS " ]]; then
1308
1309
log_warn " Fallback Ubuntu (${AE_UBUNTU_CODENAME_LATEST} ) is a non LTS release!"
1309
1310
fi
@@ -1437,7 +1438,8 @@ function add_ppas() {
1437
1438
fi
1438
1439
done
1439
1440
else
1440
- log_error " This is Debian. PPAs are not available."
1441
+ log_error " PPAs are not supported on Debian!"
1442
+ AE_RUN_STACK_ERR+=(" config-error:config.tasks.ppa" )
1441
1443
fi
1442
1444
1443
1445
}
@@ -1629,10 +1631,12 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1629
1631
log_success " OK"
1630
1632
else
1631
1633
log_error " Adding Google Chrome Repository failed"
1634
+ AE_RUN_STACK_ERR+=(" add-repo-error:config.add_repo.chrome" )
1632
1635
fi
1633
1636
1634
1637
else
1635
1638
log_error " Google Chrome is not supported on this architecture($AE_ARCH )"
1639
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.chrome" )
1636
1640
fi
1637
1641
else
1638
1642
log_debug " Skipped Google chrome repository"
@@ -1653,6 +1657,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1653
1657
fi
1654
1658
else
1655
1659
log_error " Spotify Desktop is not supported on this architecture(${AE_ARCH} )"
1660
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.spotify" )
1656
1661
fi
1657
1662
else
1658
1663
log_debug " Skipped adding Spotify repository"
@@ -1673,6 +1678,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1673
1678
fi
1674
1679
else
1675
1680
log_error " Skype for Linux is not supported on this architecture(${AE_ARCH} )"
1681
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.skype" )
1676
1682
fi
1677
1683
else
1678
1684
log_debug " Skipped Skype for Linux."
@@ -1692,7 +1698,8 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1692
1698
log_error " Failed to addd Signal for desktop repository!"
1693
1699
fi
1694
1700
else
1695
- log_error " Signal for Desktop is not supported on this architecture(${AE_ARCH} )"
1701
+ log_error " Signal for Desktop is not supported on this (${AE_ARCH} )"
1702
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.signal" )
1696
1703
fi
1697
1704
else
1698
1705
log_debug " Skipped adding Signal for desktop repository"
@@ -1713,6 +1720,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1713
1720
fi
1714
1721
else
1715
1722
log_error " Mendeley Desktop is not supported on this architecture(${AE_ARCH} )"
1723
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.mendeley" )
1716
1724
fi
1717
1725
1718
1726
else
@@ -1728,6 +1736,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1728
1736
log_error " Latest version of WINE depends on libfaudio0 package,"
1729
1737
log_error " which is not available on your distribution!"
1730
1738
log_warn " For more information visit https://forum.winehq.org/viewtopic.php?f=8&t=32192"
1739
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.winehq" )
1731
1740
else
1732
1741
__add_repo_keys --format " asc" \
1733
1742
--file-prefix " wine-hq" \
@@ -1747,6 +1756,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1747
1756
fi
1748
1757
else
1749
1758
log_error " WineHQ is not supported on this architecture(${AE_ARCH} )"
1759
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.winehq" )
1750
1760
fi
1751
1761
else
1752
1762
log_info " Skipped adding WineHQ."
@@ -1787,6 +1797,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1787
1797
fi
1788
1798
else
1789
1799
log_error " GCSFUSE is not supported on this architecture(${AE_ARCH} )"
1800
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.gcsfuse" )
1790
1801
fi
1791
1802
1792
1803
else
@@ -1877,6 +1888,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1877
1888
fi
1878
1889
else
1879
1890
log_error " Microsoft Edge is not supported on this architecture($AE_ARCH )!"
1891
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.edge" )
1880
1892
fi
1881
1893
else
1882
1894
log_debug " Skipped adding Microsoft Edge repository"
@@ -1893,6 +1905,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1893
1905
fi
1894
1906
else
1895
1907
log_error " Microsoft Teams is not supported on this architecture($AE_ARCH )!"
1908
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.teams" )
1896
1909
fi
1897
1910
else
1898
1911
log_debug " Skipped adding Microsoft Teams repository"
@@ -1949,6 +1962,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1949
1962
1950
1963
else
1951
1964
log_error " Hashicorp repository is not supported on this architecture($AE_ARCH )!"
1965
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.hashicorp" )
1952
1966
fi
1953
1967
else
1954
1968
log_debug " Skipped adding Hashicorp repository"
@@ -1970,6 +1984,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1970
1984
1971
1985
else
1972
1986
log_error " Bazel repository is not supported on this architecture($AE_ARCH )!"
1987
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.bazel" )
1973
1988
fi
1974
1989
else
1975
1990
log_debug " Skipped adding Bazel repository"
@@ -1995,6 +2010,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
1995
2010
else
1996
2011
log_error " gVisor is not supported on this architecture(${AE_ARCH} )"
1997
2012
log_dev " Visit https://gvisor.dev/ for more info"
2013
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.gvisor" )
1998
2014
fi
1999
2015
2000
2016
else
@@ -2020,10 +2036,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
2020
2036
2021
2037
else
2022
2038
log_error " Podman is not supported on ${AE_DISTRO_NAME} /${AE_ARCH} "
2023
- if [[ ${AE_RUN_DISTRO_NAME} == " debian" ]]; then
2024
- log_warn " Podman depends on libseccomp2 from backports repository."
2025
- log_warn " See https://podman.io/getting-started/installation."
2026
- fi
2039
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.podman" )
2027
2040
fi
2028
2041
2029
2042
else
@@ -2047,6 +2060,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
2047
2060
2048
2061
else
2049
2062
log_error " SublimeText repository is not supported on this architecture($AE_ARCH )!"
2063
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.sublimetext" )
2050
2064
fi
2051
2065
else
2052
2066
log_debug " Skipped adding SublimeText repository"
@@ -2078,6 +2092,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
2078
2092
2079
2093
else
2080
2094
log_error " Brave Browser repository is not supported on this architecture($AE_ARCH )!"
2095
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.brave_browser" )
2081
2096
fi
2082
2097
else
2083
2098
log_debug " Skipped adding Brave Browser repository"
@@ -2103,11 +2118,12 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
2103
2118
if echo " deb [arch=amd64 signed-by=${AE_APT_KEYRINGS_DIR} /slack-archive-keyring.gpg] https://packagecloud.io/slacktechnologies/slack/debian/ jessie main #Slack" > ${AE_APT_SOURCES_DIR} /slack.list; then
2104
2119
log_success " OK"
2105
2120
else
2106
- log_error " Failed to add Brave Browser repository"
2121
+ log_error " Failed to add Slack repository"
2107
2122
fi
2108
2123
2109
2124
else
2110
2125
log_error " Slack is not supported on this architecture($AE_ARCH )!"
2126
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.slack" )
2111
2127
fi
2112
2128
else
2113
2129
log_debug " Skipped adding Slack repository"
@@ -2139,6 +2155,8 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
2139
2155
2140
2156
else
2141
2157
log_error " Vivaldi Browser repository is not supported on this architecture($AE_ARCH )!"
2158
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported:config.add_repo.vivaldi" )
2159
+
2142
2160
fi
2143
2161
else
2144
2162
log_debug " Skipped adding Vivaldi Browser repository"
@@ -2179,7 +2197,7 @@ deb https://desktop-download.mendeley.com/download/apt stable main"
2179
2197
fi
2180
2198
else
2181
2199
log_error " Miniconda repository is not supported on this architecture($AE_ARCH )!"
2182
- AE_RUN_STACK_ERR+=(" repo-unsupported-error: :config.add_repo.miniconda" )
2200
+ AE_RUN_STACK_ERR+=(" add- repo-unsupported:config.add_repo.miniconda" )
2183
2201
fi
2184
2202
else
2185
2203
log_debug " Skipped adding Miniconda repository"
@@ -2206,12 +2224,35 @@ deb [signed-by=${AE_APT_KEYRINGS_DIR}/neurodebian-archive-keyring.gpg] http://ne
2206
2224
fi
2207
2225
else
2208
2226
log_error " NeuroDebian repository is not supported on this architecture($AE_ARCH )!"
2209
- AE_RUN_STACK_ERR+=(" repo-unsupported-error ::config.add_repo.neurodebian" )
2227
+ AE_RUN_STACK_ERR+=(" add- repo-unsupported::config.add_repo.neurodebian" )
2210
2228
fi
2211
2229
else
2212
2230
log_debug " Skipped adding NeuroDebian repository"
2213
2231
fi
2214
2232
2233
+ # Element (riot.im)
2234
+ if [[ $AE_RUN_CONFIG_REPO_ELEMENT_IO == " true" ]]; then
2235
+ if [ " $AE_ARCH " == " amd64" ]; then
2236
+ log_info " Element / Riot (Matrix Client)"
2237
+ __add_repo_keys \
2238
+ --format " gpg" \
2239
+ --file-prefix " element-io-archive-keyring" \
2240
+ --key-url " https://packages.riot.im/debian/riot-im-archive-keyring.gpg"
2241
+
2242
+ if echo " deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.riot.im/debian/ default main #element.io" > ${AE_APT_SOURCES_DIR} /element-io.list; then
2243
+ log_success " OK"
2244
+ else
2245
+ log_error " Failed to add Element.io/Riot.im repository"
2246
+ AE_RUN_STACK_ERR+=(" repo-add-error::config.add_repo.element" )
2247
+ fi
2248
+ else
2249
+ log_error " NeuElement.io/Riot.imroDebian repository is not supported on this architecture($AE_ARCH )!"
2250
+ AE_RUN_STACK_ERR+=(" add-repo-unsupported::config.add_repo.element" )
2251
+ fi
2252
+ else
2253
+ log_debug " Skipped adding Element.io/Riot.im repository"
2254
+ fi
2255
+
2215
2256
# ROS2
2216
2257
# Arch support varies on distro so lot of ugly elifs.
2217
2258
ros2_supported=" false"
@@ -2566,6 +2607,7 @@ function purge_not_required() {
2566
2607
if [[ $exit_status -eq 0 ]]; then
2567
2608
log_success " Done!"
2568
2609
else
2610
+ AE_RUN_STACK_ERR+=(" install-error::config.purge" )
2569
2611
log_error " Something went wrong while purging packages."
2570
2612
log_error " Please see the log file for more details."
2571
2613
fi
@@ -2631,6 +2673,7 @@ function install_apps() {
2631
2673
if [[ $exit_status -eq 0 ]]; then
2632
2674
log_success " Done!"
2633
2675
else
2676
+ AE_RUN_STACK_ERR+=(" install-error::config.install.apt.${array} " )
2634
2677
log_error " Something went wrong while installing packages in set - $array ."
2635
2678
log_error " Please see the log file for more details."
2636
2679
fi
@@ -2933,6 +2976,7 @@ function _process_menu() {
2933
2976
-------------------------------------------------------
2934
2977
Brave Browser : $AE_RUN_CONFIG_REPO_BRAVE_BROWSER
2935
2978
Docker Community Edition : $AE_RUN_CONFIG_REPO_DOCKER
2979
+ Element.io/Riot.im : $AE_RUN_CONFIG_REPO_ELEMENT_IO
2936
2980
GitHub CLI : $AE_RUN_CONFIG_REPO_GH
2937
2981
Google - Bazel : $AE_RUN_CONFIG_REPO_BAZEL
2938
2982
Google - Chrome : $AE_RUN_CONFIG_REPO_CHROME
0 commit comments