diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1815dfd..bc12b97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,4 +35,4 @@ jobs: prerelease: false automatic_release_tag: ${{ steps.get_version.outputs.VERSION }} title: ${{ steps.get_version.outputs.VERSION }} - files: ../sugar-cubes_*.deb \ No newline at end of file + files: ../vanilla-first-setup_*.deb \ No newline at end of file diff --git a/.gitignore b/.gitignore index 040a084..bf17dba 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ mesonbuild/ build/ debian/files -debian/sugar-cubes* +debian/vanilla-first-setup* debian/.debhelper \ No newline at end of file diff --git a/README.md b/README.md index aed5426..73537f5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-

Sugar Cubes

+

Vanilla OS First Setup

This utility is meant to be used in Vanilla OS as a first-setup wizard. It's purpose is to help the user to configure the system to his needs, e.g. by configuring snap, flatpak, flathub, etc.

@@ -28,5 +28,5 @@ sudo ninja -C build install ## Run ```bash -sugar-cubes +vanilla-first-setup ``` \ No newline at end of file diff --git a/data/icons/hicolor/scalable/apps/io.github.vanilla-os.SugarCubes.svg b/data/icons/hicolor/scalable/apps/io.github.vanilla-os.FirstSetup.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/io.github.vanilla-os.SugarCubes.svg rename to data/icons/hicolor/scalable/apps/io.github.vanilla-os.FirstSetup.svg diff --git a/data/icons/hicolor/symbolic/apps/io.github.vanilla-os.SugarCubes-symbolic.svg b/data/icons/hicolor/symbolic/apps/io.github.vanilla-os.FirstSetup-symbolic.svg similarity index 100% rename from data/icons/hicolor/symbolic/apps/io.github.vanilla-os.SugarCubes-symbolic.svg rename to data/icons/hicolor/symbolic/apps/io.github.vanilla-os.FirstSetup-symbolic.svg diff --git a/data/icons/meson.build b/data/icons/meson.build index fa858ba..d4fb2aa 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,4 +1,4 @@ -application_id = 'io.github.vanilla-os.SugarCubes' +application_id = 'io.github.vanilla-os.FirstSetup' scalable_dir = join_paths('hicolor', 'scalable', 'apps') install_data( diff --git a/data/io.github.vanilla-os.SugarCubes.appdata.xml.in b/data/io.github.vanilla-os.FirstSetup.appdata.xml.in similarity index 82% rename from data/io.github.vanilla-os.SugarCubes.appdata.xml.in rename to data/io.github.vanilla-os.FirstSetup.appdata.xml.in index a768d74..4515201 100644 --- a/data/io.github.vanilla-os.SugarCubes.appdata.xml.in +++ b/data/io.github.vanilla-os.FirstSetup.appdata.xml.in @@ -1,16 +1,16 @@ - io.github.vanilla-os.SugarCubes.desktop + io.github.vanilla-os.FirstSetup.desktop CC0-1.0 GPL-3.0-only - Sugar Cubes + Vanilla OS First Setup Tweak your Ubuntu Vanilla GNOME installation. Mirko Brombin

No description

- io.github.vanilla-os.SugarCubes + io.github.vanilla-os.FirstSetup pointing diff --git a/data/io.github.vanilla-os.FirstSetup.desktop.in b/data/io.github.vanilla-os.FirstSetup.desktop.in new file mode 100644 index 0000000..9136025 --- /dev/null +++ b/data/io.github.vanilla-os.FirstSetup.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Vanilla OS First Setup +Exec=vanilla-first-setup +Icon=io.github.vanilla-os.FirstSetup +Terminal=false +Type=Application +Categories=GTK; +StartupNotify=true \ No newline at end of file diff --git a/data/io.github.vanilla-os.FirstSetup.gschema.xml b/data/io.github.vanilla-os.FirstSetup.gschema.xml new file mode 100644 index 0000000..fa47815 --- /dev/null +++ b/data/io.github.vanilla-os.FirstSetup.gschema.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/data/io.github.vanilla-os.SugarCubes.desktop.in b/data/io.github.vanilla-os.SugarCubes.desktop.in deleted file mode 100644 index 914fcf6..0000000 --- a/data/io.github.vanilla-os.SugarCubes.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Sugar Cubes -Exec=sugar-cubes -Icon=io.github.vanilla-os.SugarCubes -Terminal=false -Type=Application -Categories=GTK; -StartupNotify=true \ No newline at end of file diff --git a/data/io.github.vanilla-os.SugarCubes.gschema.xml b/data/io.github.vanilla-os.SugarCubes.gschema.xml deleted file mode 100644 index 3d78c47..0000000 --- a/data/io.github.vanilla-os.SugarCubes.gschema.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/data/meson.build b/data/meson.build index c33eaac..2ad5689 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ desktop_file = i18n.merge_file( - input: 'io.github.vanilla-os.SugarCubes.desktop.in', - output: 'io.github.vanilla-os.SugarCubes.desktop', + input: 'io.github.vanilla-os.FirstSetup.desktop.in', + output: 'io.github.vanilla-os.FirstSetup.desktop', type: 'desktop', po_dir: '../po', install: true, @@ -15,8 +15,8 @@ if desktop_utils.found() endif appstream_file = i18n.merge_file( - input: 'io.github.vanilla-os.SugarCubes.appdata.xml.in', - output: 'io.github.vanilla-os.SugarCubes.appdata.xml', + input: 'io.github.vanilla-os.FirstSetup.appdata.xml.in', + output: 'io.github.vanilla-os.FirstSetup.appdata.xml', po_dir: '../po', install: true, install_dir: join_paths(get_option('datadir'), 'appdata') @@ -29,7 +29,7 @@ if appstream_util.found() ) endif -install_data('io.github.vanilla-os.SugarCubes.gschema.xml', +install_data('io.github.vanilla-os.FirstSetup.gschema.xml', install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') ) diff --git a/debian/changelog b/debian/changelog index fd95024..c5aa219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sugar-cubes (0.0.3) jammy; urgency=low +vanilla-first-setup (0.0.3) jammy; urgency=low * First release diff --git a/debian/control b/debian/control index af42350..5a779bd 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: sugar-cubes +Source: vanilla-first-setup Section: utils Priority: optional Maintainer: Mirko Brombin @@ -11,12 +11,12 @@ Build-Depends: gettext, desktop-file-utils, make -Homepage: https://github.com/mirkobrombin/sugar-cubes/ -Vcs-Browser: hhttps://github.com/mirkobrombin/sugar-cubes -Vcs-Git: https://github.com/mirkobrombin/sugar-cubes.git +Homepage: https://github.com/mirkobrombin/vanilla-first-setup/ +Vcs-Browser: hhttps://github.com/mirkobrombin/vanilla-first-setup +Vcs-Git: https://github.com/mirkobrombin/vanilla-first-setup.git Rules-Requires-Root: no -Package: sugar-cubes +Package: vanilla-first-setup Architecture: any Depends: python3, python3-gi, diff --git a/debian/copyright b/debian/copyright index a2f8f8d..76eec4b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 -Upstream-Name: Sugar Cubes -Source: https://github.com/mirko-brombin/sugar-cubes +Upstream-Name: Vanilla OS First Setup +Source: https://github.com/mirko-brombin/vanilla-first-setup Files: * Copyright: 2022 Mirko Brombin diff --git a/debian/ubuntu-smoother/DEBIAN/control b/debian/ubuntu-smoother/DEBIAN/control index 3c3168c..890159b 100644 --- a/debian/ubuntu-smoother/DEBIAN/control +++ b/debian/ubuntu-smoother/DEBIAN/control @@ -1,4 +1,4 @@ -Package: sugar-cubes +Package: vanilla-first-setup Version: 0.0.1 Architecture: amd64 Maintainer: Mirko Brombin @@ -6,5 +6,5 @@ Installed-Size: 65 Depends: dconf-gsettings-backend | gsettings-backend, python3, python3-gi, libadwaita-1, gir1.2-gtk-4.0, gir1.2-adw-1 Section: utils Priority: optional -Homepage: https://github.com/mirkobrombin/sugar-cubes/ +Homepage: https://github.com/mirkobrombin/vanilla-first-setup/ Description: This utility is meant to be used in Ubuntu Vanilla GNOME as a first-setup wizard. diff --git a/debian/ubuntu-smoother/DEBIAN/md5sums b/debian/ubuntu-smoother/DEBIAN/md5sums index 51411fa..4056717 100644 --- a/debian/ubuntu-smoother/DEBIAN/md5sums +++ b/debian/ubuntu-smoother/DEBIAN/md5sums @@ -1,24 +1,24 @@ -3f84a85bd8dcb22475ca07a2d69063ac usr/bin/sugar-cubes -e53214a91cfee2c537138e64d0d2357e usr/bin/sugar-cubes-processor -f62ae2de8dd39b794fa94951db288612 usr/share/appdata/pm.mirko.SugarCubes.appdata.xml -572c7ac7342d5e999af8cf5fc99fc7ba usr/share/applications/pm.mirko.SugarCubes.desktop -632c1335ca45192e9b887308023c156c usr/share/doc/sugar-cubes/changelog.gz -62ed186d7529beecf72bcf7c48b53a76 usr/share/doc/sugar-cubes/copyright -3ff815595db45e9dcd137d06f9d8718c usr/share/glib-2.0/schemas/pm.mirko.SugarCubes.gschema.xml -a3cd0585c74138a988a7225dd57fc171 usr/share/icons/hicolor/scalable/apps/pm.mirko.SugarCubes.svg -a3cd0585c74138a988a7225dd57fc171 usr/share/icons/hicolor/symbolic/apps/pm.mirko.SugarCubes-symbolic.svg -75fdbd9173045311c140056e34292035 usr/share/pm.mirko.SugarCubes/sugar-cubes.gresource -d41d8cd98f00b204e9800998ecf8427e usr/share/pm.mirko.SugarCubes/sugar_cubes/__init__.py -cacabd792fe13148f625e90b1d63e343 usr/share/pm.mirko.SugarCubes/sugar_cubes/main.py -d41d8cd98f00b204e9800998ecf8427e usr/share/pm.mirko.SugarCubes/sugar_cubes/models/__init__.py -655cc3575fd9547bcc28605a40adecb4 usr/share/pm.mirko.SugarCubes/sugar_cubes/models/config.py -19a9c8ef77a0b94b9bd9da204bf619be usr/share/pm.mirko.SugarCubes/sugar_cubes/models/preset.py -d41d8cd98f00b204e9800998ecf8427e usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/__init__.py -24bb5bd4e6d6262c1b454b3656ab24e0 usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/apt.py -4d805e042731d213eb5139530d8aa638 usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/checks.py -7823cbc7898533c975d6a44bc5805480 usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/configurator.py -d757da1b73916417336840cc67295681 usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/flatpak.py -f2595187532f527875795277675234a5 usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/processor.py -0ebff648510796f3d38e84739469f97e usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/run_async.py -ebbd22d7a8847f604900387b8c9d86a2 usr/share/pm.mirko.SugarCubes/sugar_cubes/utils/snap.py -f07c8b3e157f197d2cefd0a89862b3c1 usr/share/pm.mirko.SugarCubes/sugar_cubes/window.py +3f84a85bd8dcb22475ca07a2d69063ac usr/bin/vanilla-first-setup +e53214a91cfee2c537138e64d0d2357e usr/bin/vanilla-first-setup-processor +f62ae2de8dd39b794fa94951db288612 usr/share/appdata/pm.mirko.FirstSetup.appdata.xml +572c7ac7342d5e999af8cf5fc99fc7ba usr/share/applications/pm.mirko.FirstSetup.desktop +632c1335ca45192e9b887308023c156c usr/share/doc/vanilla-first-setup/changelog.gz +62ed186d7529beecf72bcf7c48b53a76 usr/share/doc/vanilla-first-setup/copyright +3ff815595db45e9dcd137d06f9d8718c usr/share/glib-2.0/schemas/pm.mirko.FirstSetup.gschema.xml +a3cd0585c74138a988a7225dd57fc171 usr/share/icons/hicolor/scalable/apps/pm.mirko.FirstSetup.svg +a3cd0585c74138a988a7225dd57fc171 usr/share/icons/hicolor/symbolic/apps/pm.mirko.FirstSetup-symbolic.svg +75fdbd9173045311c140056e34292035 usr/share/pm.mirko.FirstSetup/vanilla-first-setup.gresource +d41d8cd98f00b204e9800998ecf8427e usr/share/pm.mirko.FirstSetup/vanilla_first_setup/__init__.py +cacabd792fe13148f625e90b1d63e343 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/main.py +d41d8cd98f00b204e9800998ecf8427e usr/share/pm.mirko.FirstSetup/vanilla_first_setup/models/__init__.py +655cc3575fd9547bcc28605a40adecb4 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/models/config.py +19a9c8ef77a0b94b9bd9da204bf619be usr/share/pm.mirko.FirstSetup/vanilla_first_setup/models/preset.py +d41d8cd98f00b204e9800998ecf8427e usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/__init__.py +24bb5bd4e6d6262c1b454b3656ab24e0 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/apt.py +4d805e042731d213eb5139530d8aa638 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/checks.py +7823cbc7898533c975d6a44bc5805480 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/configurator.py +d757da1b73916417336840cc67295681 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/flatpak.py +f2595187532f527875795277675234a5 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/processor.py +0ebff648510796f3d38e84739469f97e usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/run_async.py +ebbd22d7a8847f604900387b8c9d86a2 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/utils/snap.py +f07c8b3e157f197d2cefd0a89862b3c1 usr/share/pm.mirko.FirstSetup/vanilla_first_setup/window.py diff --git a/debian/ubuntu-smoother/usr/bin/ubuntu-smoother b/debian/ubuntu-smoother/usr/bin/ubuntu-smoother index 189f607..e4b8c75 100755 --- a/debian/ubuntu-smoother/usr/bin/ubuntu-smoother +++ b/debian/ubuntu-smoother/usr/bin/ubuntu-smoother @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# sugar-cubes.in +# vanilla-first-setup.in # # Copyright 2022 mirkobrombin # @@ -23,21 +23,21 @@ import locale import gettext VERSION = '0.0.1' -pkgdatadir = '/usr/share/pm.mirko.SugarCubes' +pkgdatadir = '/usr/share/pm.mirko.FirstSetup' localedir = '/usr/share/locale' sys.path.insert(1, pkgdatadir) signal.signal(signal.SIGINT, signal.SIG_DFL) -locale.bindtextdomain('sugar_cubes', localedir) -locale.textdomain('sugar_cubes') -gettext.install('sugar_cubes', localedir) +locale.bindtextdomain('vanilla_first_setup', localedir) +locale.textdomain('vanilla_first_setup') +gettext.install('vanilla_first_setup', localedir) if __name__ == '__main__': import gi from gi.repository import Gio - resource = Gio.Resource.load(os.path.join(pkgdatadir, 'sugar-cubes.gresource')) + resource = Gio.Resource.load(os.path.join(pkgdatadir, 'vanilla-first-setup.gresource')) resource._register() - from sugar_cubes import main + from vanilla_first_setup import main sys.exit(main.main(VERSION)) \ No newline at end of file diff --git a/debian/ubuntu-smoother/usr/bin/ubuntu-smoother-processor b/debian/ubuntu-smoother/usr/bin/ubuntu-smoother-processor index 4cf47a9..3d70496 100755 --- a/debian/ubuntu-smoother/usr/bin/ubuntu-smoother-processor +++ b/debian/ubuntu-smoother/usr/bin/ubuntu-smoother-processor @@ -1,6 +1,6 @@ #!/usr/bin/python3 -# sugar-cubes-processor.in +# vanilla-first-setup-processor.in # # Copyright 2022 mirkobrombin # @@ -24,18 +24,18 @@ import gettext import argparse VERSION = '0.0.1' -pkgdatadir = '/usr/share/pm.mirko.SugarCubes' +pkgdatadir = '/usr/share/pm.mirko.FirstSetup' localedir = '/usr/share/locale' sys.path.insert(1, pkgdatadir) signal.signal(signal.SIGINT, signal.SIG_DFL) -locale.bindtextdomain('sugar_cubes', localedir) -locale.textdomain('sugar_cubes') -gettext.install('sugar_cubes', localedir) +locale.bindtextdomain('vanilla_first_setup', localedir) +locale.textdomain('vanilla_first_setup') +gettext.install('vanilla_first_setup', localedir) if __name__ == '__main__': - from sugar_cubes.utils.configurator import Configurator - from sugar_cubes.models.config import Config + from vanilla_first_setup.utils.configurator import Configurator + from vanilla_first_setup.models.config import Config parser = argparse.ArgumentParser() parser.add_argument('config', help='The configuration string (e.g. snap::True|flatpak::False|apport::True)') diff --git a/debian/ubuntu-smoother/usr/share/appdata/pm.mirko.UbuntuSmoother.appdata.xml b/debian/ubuntu-smoother/usr/share/appdata/pm.mirko.UbuntuSmoother.appdata.xml index cf9f014..97be76d 100644 --- a/debian/ubuntu-smoother/usr/share/appdata/pm.mirko.UbuntuSmoother.appdata.xml +++ b/debian/ubuntu-smoother/usr/share/appdata/pm.mirko.UbuntuSmoother.appdata.xml @@ -1,16 +1,16 @@ - pm.mirko.SugarCubes.desktop + pm.mirko.FirstSetup.desktop CC0-1.0 GPL-3.0-only - Sugar Cubes + Vanilla OS First Setup Tweak your Ubuntu Vanilla GNOME installation. Mirko Brombin

No description

- pm.mirko.SugarCubes + pm.mirko.FirstSetup pointing diff --git a/debian/ubuntu-smoother/usr/share/applications/pm.mirko.UbuntuSmoother.desktop b/debian/ubuntu-smoother/usr/share/applications/pm.mirko.UbuntuSmoother.desktop index d8c8508..0415be0 100644 --- a/debian/ubuntu-smoother/usr/share/applications/pm.mirko.UbuntuSmoother.desktop +++ b/debian/ubuntu-smoother/usr/share/applications/pm.mirko.UbuntuSmoother.desktop @@ -1,7 +1,7 @@ [Desktop Entry] -Name=Sugar Cubes -Exec=sugar-cubes -Icon=pm.mirko.SugarCubes +Name=Vanilla OS First Setup +Exec=vanilla-first-setup +Icon=pm.mirko.FirstSetup Terminal=false Type=Application Categories=GTK; diff --git a/debian/ubuntu-smoother/usr/share/doc/ubuntu-smoother/copyright b/debian/ubuntu-smoother/usr/share/doc/ubuntu-smoother/copyright index a2f8f8d..76eec4b 100644 --- a/debian/ubuntu-smoother/usr/share/doc/ubuntu-smoother/copyright +++ b/debian/ubuntu-smoother/usr/share/doc/ubuntu-smoother/copyright @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 -Upstream-Name: Sugar Cubes -Source: https://github.com/mirko-brombin/sugar-cubes +Upstream-Name: Vanilla OS First Setup +Source: https://github.com/mirko-brombin/vanilla-first-setup Files: * Copyright: 2022 Mirko Brombin diff --git a/debian/ubuntu-smoother/usr/share/glib-2.0/schemas/pm.mirko.UbuntuSmoother.gschema.xml b/debian/ubuntu-smoother/usr/share/glib-2.0/schemas/pm.mirko.UbuntuSmoother.gschema.xml index b52cd1a..66bebef 100644 --- a/debian/ubuntu-smoother/usr/share/glib-2.0/schemas/pm.mirko.UbuntuSmoother.gschema.xml +++ b/debian/ubuntu-smoother/usr/share/glib-2.0/schemas/pm.mirko.UbuntuSmoother.gschema.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/main.py b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/main.py index 171e703..dd66292 100644 --- a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/main.py +++ b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/main.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from sugar_cubes.window import SugarCubesWindow +from vanilla_first_setup.window import FirstSetupWindow from gi.repository import Gtk, Gio, Adw import sys import gi @@ -27,11 +27,11 @@ gi.require_version('Adw', '1') logging.basicConfig(level=logging.INFO) -class SugarCubesApplication(Adw.Application): +class FirstSetupApplication(Adw.Application): """The main application singleton class.""" def __init__(self): - super().__init__(application_id='pm.mirko.SugarCubes', + super().__init__(application_id='pm.mirko.FirstSetup', flags=Gio.ApplicationFlags.FLAGS_NONE) self.create_action('quit', self.close, ['q']) @@ -43,7 +43,7 @@ class SugarCubesApplication(Adw.Application): """ win = self.props.active_window if not win: - win = SugarCubesWindow(application=self) + win = FirstSetupWindow(application=self) win.present() def create_action(self, name, callback, shortcuts=None): @@ -68,5 +68,5 @@ class SugarCubesApplication(Adw.Application): def main(version): """The application's entry point.""" - app = SugarCubesApplication() + app = FirstSetupApplication() return app.run(sys.argv) diff --git a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/configurator.py b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/configurator.py index 8a88a10..1f49f0c 100644 --- a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/configurator.py +++ b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/configurator.py @@ -2,13 +2,13 @@ import os import time import logging -from sugar_cubes.utils import checks -from sugar_cubes.utils.apt import Apt -from sugar_cubes.utils.flatpak import Flatpak -from sugar_cubes.utils.snap import Snap +from vanilla_first_setup.utils import checks +from vanilla_first_setup.utils.apt import Apt +from vanilla_first_setup.utils.flatpak import Flatpak +from vanilla_first_setup.utils.snap import Snap -logger = logging.getLogger("SugarCubes::Configurator") +logger = logging.getLogger("FirstSetup::Configurator") class Configurator: @@ -79,7 +79,7 @@ class Configurator: if self.fake: return self.__fake("Fake: Disable on startup") - autostart_file = os.path.expanduser("~/.config/autostart/sugar-cubes.desktop") + autostart_file = os.path.expanduser("~/.config/autostart/vanilla-first-setup.desktop") if os.path.exists(autostart_file): os.remove(autostart_file) @@ -87,13 +87,13 @@ class Configurator: if self.fake: return self.__fake("Fake: Enable on startup") - autostart_file = os.path.expanduser("~/.config/autostart/sugar-cubes.desktop") + autostart_file = os.path.expanduser("~/.config/autostart/vanilla-first-setup.desktop") if not os.path.exists(autostart_file): with open(autostart_file, "w") as f: f.write("[Desktop Entry]") f.write("Type=Application") - f.write("Name=Sugar Cubes") - f.write("Exec=sugar-cubes") + f.write("Name=Vanilla OS First Setup") + f.write("Exec=vanilla-first-setup") f.write("Terminal=false") f.write("X-GNOME-Autostart-enabled=true") \ No newline at end of file diff --git a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/processor.py b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/processor.py index e048f88..29379c8 100644 --- a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/processor.py +++ b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/processor.py @@ -8,11 +8,11 @@ class Processor: def run(self): proc = subprocess.run( - ["pkexec", "sugar-cubes-processor", self.__config.get_str()], + ["pkexec", "vanilla-first-setup-processor", self.__config.get_str()], check=True ) if proc.returncode != 0: - return False, "Error executing the Sugar Cubes Processor" + return False, "Error executing the Vanilla OS First Setup Processor" return True \ No newline at end of file diff --git a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/run_async.py b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/run_async.py index ad13516..211761a 100644 --- a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/run_async.py +++ b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/utils/run_async.py @@ -23,7 +23,7 @@ import logging from gi.repository import GLib -logger = logging.getLogger("SugarCubes::Async") +logger = logging.getLogger("FirstSetup::Async") class RunAsync(threading.Thread): diff --git a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/window.py b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/window.py index 415dc3d..f23919c 100644 --- a/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/window.py +++ b/debian/ubuntu-smoother/usr/share/pm.mirko.UbuntuSmoother/ubuntu_smoother/window.py @@ -16,15 +16,15 @@ from gi.repository import Gtk, Gio, Adw -from sugar_cubes.models.preset import Preset -from sugar_cubes.models.config import Config -from sugar_cubes.utils.processor import Processor -from sugar_cubes.utils.run_async import RunAsync +from vanilla_first_setup.models.preset import Preset +from vanilla_first_setup.models.config import Config +from vanilla_first_setup.utils.processor import Processor +from vanilla_first_setup.utils.run_async import RunAsync -@Gtk.Template(resource_path='/pm/mirko/SugarCubes/gtk/window.ui') -class SugarCubesWindow(Adw.ApplicationWindow): - __gtype_name__ = 'SugarCubesWindow' +@Gtk.Template(resource_path='/pm/mirko/FirstSetup/gtk/window.ui') +class FirstSetupWindow(Adw.ApplicationWindow): + __gtype_name__ = 'FirstSetupWindow' carousel = Gtk.Template.Child() btn_start = Gtk.Template.Child() diff --git a/meson.build b/meson.build index e750c8e..82fbd71 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('io.github.vanilla-os.SugarCubes', +project('io.github.vanilla-os.FirstSetup', version: '0.0.3', meson_version: '>= 0.59.0', default_options: [ 'warning_level=2', @@ -11,7 +11,7 @@ i18n = import('i18n') gnome = import('gnome') subdir('data') -subdir('sugar_cubes') +subdir('vanilla_first_setup') subdir('po') gnome.post_install( diff --git a/po/meson.build b/po/meson.build index 88689b4..ee0a7be 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1 +1 @@ -i18n.gettext('sugar-cubes', preset: 'glib') \ No newline at end of file +i18n.gettext('vanilla-first-setup', preset: 'glib') \ No newline at end of file diff --git a/sugar_cubes/__init__.py b/vanilla_first_setup/__init__.py similarity index 100% rename from sugar_cubes/__init__.py rename to vanilla_first_setup/__init__.py diff --git a/sugar_cubes/gtk/window.ui b/vanilla_first_setup/gtk/window.ui similarity index 97% rename from sugar_cubes/gtk/window.ui rename to vanilla_first_setup/gtk/window.ui index c61d7ea..0e210af 100644 --- a/sugar_cubes/gtk/window.ui +++ b/vanilla_first_setup/gtk/window.ui @@ -2,10 +2,10 @@ -