complete-rework-test

taukakao · Feb 19, 2025 · f65c681 · f65c681
1 parent 42c61f8
commit f65c681
Show file tree

Hide file tree

Showing 191 changed files with 24,027 additions and 16,072 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,13 +18,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get the version
-        id: get_version
-        run: echo "{VERSION}={$(cat VERSION)}" >> $GITHUB_OUTPUT
-
       - name: Install build dependencies
         run: |
-          apt install -y debhelper python3 gettext build-essential desktop-file-utils ninja-build meson libadwaita-1-dev make libnm-dev libnma-dev libnma-gtk4-dev
+          apt-get update
+          apt-get build-dep -y .
 
       - name: Build .deb package
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,13 +20,15 @@ jobs:
     steps:
         - uses: actions/checkout@v4
 
-        - name: Get the version
-          id: get_version
-          run: echo "{VERSION}={$(cat VERSION)}" >> $GITHUB_OUTPUT
+        - name: Set meson version by tag
+          id: set_version
+          run: |
+            sed -i 's/VTESTING/${{ github.ref_name }}/g' meson.build
   
         - name: Install build dependencies
           run: |
-            apt install -y debhelper python3 gettext build-essential desktop-file-utils ninja-build meson libadwaita-1-dev make libnm-dev libnma-dev libnma-gtk4-dev
+            apt-get update
+            apt-get build-dep -y .
   
         - name: Build .deb package
           run: |

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ debian/vanilla-first-setup
 debian/.debhelper
 */__pycache__
 *.pyc
-/localbuild
+vanilla_first_setup/vanilla-first-setup.gresource
 .buildconfig
 install/
+localegen/
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+# TODO: adjust readme
+
 <div align="center">
     <img src="data/icons/hicolor/scalable/apps/org.vanillaos.FirstSetup.svg">
     <h1>Vanilla OS First Setup</h1>

diff --git a/VERSION b/VERSION
diff --git a/__first_setup_cleanup b/__first_setup_cleanup
diff --git a/__first_setup_reset_session b/__first_setup_reset_session
diff --git a/data/firstsetup.json → data/firstsetup-session-mode.json b/data/firstsetup.json → data/firstsetup-session-mode.json
diff --git a/data/firstsetup.desktop → data/firstsetup-session.desktop b/data/firstsetup.desktop → data/firstsetup-session.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
 Name=FirstSetup
 Comment=This session provides a First Setup interface
-Exec=env GNOME_SHELL_SESSION_MODE=firstsetup gnome-session --session=firstsetup
-TryExec=gnome-shell
-Icon=
+Exec=env GNOME_SHELL_SESSION_MODE=firstsetup /usr/bin/gnome-session
+TryExec=/usr/bin/gnome-session
 Type=Application
 DesktopNames=vanilla:GNOME
 X-GDM-SessionRegisters=true

diff --git a/data/firstsetup.session b/data/firstsetup.session
diff --git a/data/firstsetup.session.conf b/data/firstsetup.session.conf
diff --git a/data/icons/hicolor/symbolic/actions/background-app-ghost-symbolic.svg b/data/icons/hicolor/symbolic/actions/background-app-ghost-symbolic.svg
diff --git a/data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg
diff --git a/data/icons/hicolor/symbolic/actions/vanilla-history-undo-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-history-undo-symbolic.svg
diff --git a/data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg
diff --git a/data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
@@ -1,44 +1,20 @@
-application_id = 'org.vanillaos.FirstSetup'
-
+icons_dir = join_paths(get_option('datadir'), 'icons')
 
 scalable_dir = join_paths('hicolor', 'scalable', 'apps')
-symbolic_dir = join_paths('hicolor', 'symbolic')
-actions_dir = join_paths(symbolic_dir, 'actions')
+symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
 
 
 install_data(
-  join_paths(scalable_dir, ('@0@.svg').format(application_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
+  join_paths(scalable_dir, 'org.vanillaos.FirstSetup.svg'),
+  install_dir: join_paths(icons_dir, scalable_dir)
 )
 
-
 install_data(
-  join_paths(symbolic_dir, 'apps', ('@0@-symbolic.svg').format(application_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir, 'apps')
+  join_paths(scalable_dir, 'org.vanillaos.FirstSetup-flower.svg'),
+  install_dir: join_paths(icons_dir, scalable_dir)
 )
 
 install_data(
-  join_paths(scalable_dir, ('org.vanillaos.FirstSetup-flower.svg').format(application_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
-)
-
-install_data(
-    join_paths(actions_dir, 'background-app-ghost-symbolic.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
-)
-install_data(
-    join_paths(actions_dir, 'vanilla-container-terminal-symbolic.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
-)
-install_data(
-    join_paths(actions_dir, 'vanilla-package-symbolic.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
-)
-install_data(
-    join_paths(actions_dir, 'vanilla-puzzle-piece-symbolic.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
-)
-install_data(
-    join_paths(actions_dir, 'vanilla-history-undo-symbolic.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
+  join_paths(symbolic_dir, 'org.vanillaos.FirstSetup-symbolic.svg'),
+  install_dir: join_paths(icons_dir, symbolic_dir)
 )