From 464ad5aa95bb574e736778c066f0c50ffb25cdb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 19 Mar 2023 18:43:19 +0100 Subject: [PATCH] tools/create-toolbox: Allow setting up support for GNOME Classic As unbeloved as it is, it still needs testing. Make that a tad bit less annoying by automating the setup. Part-of: --- tools/toolbox/create-toolbox.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/toolbox/create-toolbox.sh b/tools/toolbox/create-toolbox.sh index c63c49e56..0294719af 100755 --- a/tools/toolbox/create-toolbox.sh +++ b/tools/toolbox/create-toolbox.sh @@ -18,6 +18,7 @@ usage() { -v, --version=VERSION Create container for stable version VERSION (like 44) instead of the main branch -r, --replace Replace an existing container + -c, --classic Set up support for GNOME Classic -b, --builder Set up GNOME Builder configuration --locales=LOCALES Enable support for additional locales LOCALES --skip-mutter Do not build mutter @@ -39,6 +40,7 @@ install_extra_packages() { local -a pkgs pkgs+=( ${LOCALES[@]/#/glibc-langpack-} ) + [[ $SETUP_CLASSIC ]] && pkgs+=( gnome-menus ) [[ ${#pkgs[@]} > 0 ]] && toolbox_run su -c "dnf install -y ${pkgs[*]}" @@ -65,12 +67,22 @@ create_builder_config() { EOF } +setup_classic() { + local branch=${VERSION:+gnome-}${VERSION:-main} + + toolbox_run /usr/libexec/install-meson-project.sh \ + --prepare "git submodule update --init" \ + -Dclassic_mode=true \ + https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git $branch +} + TEMP=$(getopt \ --name $(basename $0) \ - --options 'n:v:rbh' \ + --options 'n:v:rcbh' \ --longoptions 'name:' \ --longoptions 'version:' \ --longoptions 'replace' \ + --longoptions 'classic' \ --longoptions 'builder' \ --longoptions 'locales:' \ --longoptions 'skip-mutter' \ @@ -100,6 +112,11 @@ while true; do shift ;; + -c|--classic) + SETUP_CLASSIC=1 + shift + ;; + -b|--builder) SETUP_BUILDER=1 shift @@ -142,4 +159,5 @@ install_extra_packages [[ $SKIP_MUTTER ]] || toolbox_run update-mutter +[[ $SETUP_CLASSIC ]] && setup_classic [[ $SETUP_BUILDER ]] && create_builder_config