Switch to just usr/

2023-08-05 15:20:32 -04:00
parent c5d256bd67
commit d131c8ca9a
10 changed files with 2 additions and 2 deletions
--- a/Containerfile.cp
+++ b/Containerfile.cp
@@ -24,7 +24,7 @@ ARG RECIPE=recipe-c.yml
 # templates on immutable Fedora distros, whereas the normal "/etc" is ONLY meant
 # for manual overrides and editing by the machine's admin AFTER installation!
 # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
-COPY usr-common/ /usr
+COPY usr/ /usr
 COPY ${USR_DIR}/ /usr
 # Copy the recipe that we're building.
--- a/Containerfile.jp
+++ b/Containerfile.jp
@@ -24,7 +24,7 @@ ARG RECIPE=recipe-framework-13.yml
 # templates on immutable Fedora distros, whereas the normal "/etc" is ONLY meant
 # for manual overrides and editing by the machine's admin AFTER installation!
 # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
-COPY usr-common/ /usr
+COPY usr/ /usr
 COPY ${USR_DIR}/ /usr
 # Copy the recipe that we're building.
--- a/usr-common/bin/ublue-nix-install
+++ b/usr-common/bin/ublue-nix-install
--- a/usr-common/bin/ublue-nix-uninstall
+++ b/usr-common/bin/ublue-nix-uninstall
--- a/usr-common/share/ublue-os/firstboot/launcher/autostart.desktop
+++ b/usr-common/share/ublue-os/firstboot/launcher/autostart.desktop
--- a/usr-common/share/ublue-os/firstboot/launcher/autostart.sh
+++ b/usr-common/share/ublue-os/firstboot/launcher/autostart.sh
--- a/usr-common/share/ublue-os/firstboot/launcher/launcher-flowchart.png
+++ b/usr-common/share/ublue-os/firstboot/launcher/launcher-flowchart.png
--- a/usr-common/share/ublue-os/firstboot/launcher/login-profile.sh
+++ b/usr-common/share/ublue-os/firstboot/launcher/login-profile.sh
--- a/usr-common/share/ublue-os/firstboot/yafti.yml
+++ b/usr-common/share/ublue-os/firstboot/yafti.yml
--- a/usr-common/share/ublue-os/just/custom.just
+++ b/usr-common/share/ublue-os/just/custom.just