Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move session files to their own folder #823

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Conversation

danirabbit
Copy link
Member

Separate installer application data from session data

@danirabbit danirabbit requested a review from a team October 2, 2024 19:12
Copy link
Contributor

@zeebok zeebok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

Copy link
Contributor

@ryonakano ryonakano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compared the installation logs of main (4ad60d9) and this branch (a0f925c) and confirmed there are no changes other than the source folder (data → session):

user@VirtualBox-000a8e26:~$ diff -u --color before.log after.log 
--- before.log	2024-10-08 13:07:03.688248270 +0000
+++ after.log	2024-10-08 13:08:25.520139089 +0000
@@ -1,16 +1,17 @@
 user@VirtualBox-000a8e26:~/work/installer$ git branch 
-* main
+* danirabbit/session-folder
+  main
 user@VirtualBox-000a8e26:~/work/installer$ ninja -C builddir/ install
 ninja: Entering directory `builddir/'
 [0/1] Installing files.
-Installing subdir /home/user/work/installer/data/gsd to /etc/xdg/autostart
-Installing /home/user/work/installer/data/gsd/org.gnome.SettingsDaemon.MediaKeys-installer.desktop to /etc/xdg/autostart
+Installing subdir /home/user/work/installer/session/gsd to /etc/xdg/autostart
+Installing /home/user/work/installer/session/gsd/org.gnome.SettingsDaemon.MediaKeys-installer.desktop to /etc/xdg/autostart
 Installation failed due to insufficient permissions.
 Attempt to use /usr/bin/sudo to gain elevated privileges? [y/n] y
-Installing subdir /home/user/work/installer/data/gsd to /etc/xdg/autostart
-Installing /home/user/work/installer/data/gsd/org.gnome.SettingsDaemon.MediaKeys-installer.desktop to /etc/xdg/autostart
-Installing /home/user/work/installer/data/gsd/org.gnome.SettingsDaemon.Power-installer.desktop to /etc/xdg/autostart
-Installing /home/user/work/installer/data/gsd/org.gnome.SettingsDaemon.XSettings-installer.desktop to /etc/xdg/autostart
+Installing subdir /home/user/work/installer/session/gsd to /etc/xdg/autostart
+Installing /home/user/work/installer/session/gsd/org.gnome.SettingsDaemon.MediaKeys-installer.desktop to /etc/xdg/autostart
+Installing /home/user/work/installer/session/gsd/org.gnome.SettingsDaemon.Power-installer.desktop to /etc/xdg/autostart
+Installing /home/user/work/installer/session/gsd/org.gnome.SettingsDaemon.XSettings-installer.desktop to /etc/xdg/autostart
 Installing po/af/LC_MESSAGES/io.elementary.installer.mo to /usr/share/locale/af/LC_MESSAGES
 Installing po/ak/LC_MESSAGES/io.elementary.installer.mo to /usr/share/locale/ak/LC_MESSAGES
 Installing po/ar/LC_MESSAGES/io.elementary.installer.mo to /usr/share/locale/ar/LC_MESSAGES
@@ -112,11 +113,11 @@
 Installing data/io.elementary.installer.metainfo.xml to /usr/share/metainfo
 Installing /home/user/work/installer/daemon/io.elementary.InstallerDaemon.service to /usr/lib/systemd/system
 Installing /home/user/work/installer/daemon/io.elementary.InstallerDaemon.conf to /usr/share/dbus-1/system.d
-Installing /home/user/work/installer/data/installer.desktop to /usr/share/xsessions
-Installing /home/user/work/installer/data/autostart.desktop to /etc/xdg/autostart
-Installing /home/user/work/installer/data/compositor-autostart.desktop to /etc/xdg/autostart
-Installing /home/user/work/installer/data/installer.session to /usr/share/gnome-session/sessions
-Installing /home/user/work/installer/data/installer-default-settings.gschema.override to /usr/share/glib-2.0/schemas
+Installing /home/user/work/installer/session/autostart.desktop to /etc/xdg/autostart
+Installing /home/user/work/installer/session/compositor-autostart.desktop to /etc/xdg/autostart
+Installing /home/user/work/installer/session/installer.desktop to /usr/share/xsessions
+Installing /home/user/work/installer/session/installer.session to /usr/share/gnome-session/sessions
+Installing /home/user/work/installer/session/installer-default-settings.gschema.override to /usr/share/glib-2.0/schemas
 Installing /home/user/work/installer/data/icons/16.svg to /usr/share/icons/hicolor/16x16/apps
 Installing /home/user/work/installer/data/icons/16.svg to /usr/share/icons/hicolor/16x16@2/apps
 Installing /home/user/work/installer/data/icons/24.svg to /usr/share/icons/hicolor/24x24/apps
user@VirtualBox-000a8e26:~$

@danirabbit danirabbit merged commit 11ecfdd into main Oct 8, 2024
5 checks passed
@danirabbit danirabbit deleted the danirabbit/session-folder branch October 8, 2024 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants