diff --git a/includes.container/etc/os-release b/includes.container/etc/os-release deleted file mode 100644 index 370382b..0000000 --- a/includes.container/etc/os-release +++ /dev/null @@ -1,11 +0,0 @@ -PRETTY_NAME="Vanilla OS 2.0" -NAME="Vanilla OS" -VERSION_ID="2.0" -VERSION="2.0 Orchid" -VERSION_CODENAME="orchid" -ID=vanilla -ID_LIKE=debian -HOME_URL="https://vanillaos.org" -SUPPORT_URL="https://vanillaos.org/help" -BUG_REPORT_URL="https://github.com/vanilla-os" -PRIVACY_POLICY_URL="https://vanillaos.org/os-privacy-policy" \ No newline at end of file diff --git a/includes.container/usr/bin/vso b/includes.container/usr/bin/vso deleted file mode 100644 index 58d8681..0000000 --- a/includes.container/usr/bin/vso +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -use_pkexec=0 - -# if the 1st argument is sys-upgrade, then we enable pkexec -if [ "$1" == "sys-upgrade" ]; then - use_pkexec=1 -fi - -if [ "$use_pkexec" == "1" ]; then - # it is a privileged command, so we use pkexec - host-shell pkexec /usr/bin/vso "$@" -else - # it does not need to be privileged, so we just run it - host-shell /usr/bin/vso "$@" -fi \ No newline at end of file diff --git a/includes.container/usr/share/apx/distrobox/gen-distrobox-links b/includes.container/usr/share/apx/distrobox/gen-distrobox-links deleted file mode 100644 index cd0b668..0000000 --- a/includes.container/usr/share/apx/distrobox/gen-distrobox-links +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -targets="distrobox distrobox-host-exec distrobox-assemble distrobox-init distrobox-create distrobox-list distrobox-enter distrobox-rm distrobox-ephemeral distrobox-stop distrobox-export distrobox-upgrade distrobox-generate-entry" -for target in $targets; do - echo "#!/bin/sh" > /usr/share/apx/distrobox/$target - echo "host-spawn /usr/share/apx/distrobox/$target \$@" >> /usr/share/apx/distrobox/$target - chmod +x /usr/share/apx/distrobox/$target -done diff --git a/recipe.yml b/recipe.yml index 90ce777..927db5e 100644 --- a/recipe.yml +++ b/recipe.yml @@ -132,15 +132,14 @@ stages: commands: # host-shell links - ln -s /usr/bin/host-shell /usr/bin/apx - - ln -s /usr/bin/host-shell /usr/bin/ikaros - ln -s /usr/bin/host-shell /usr/bin/vanilla-sideload + - ln -s /usr/bin/host-shell /usr/bin/vso - chmod +x /usr/bin/apx - - chmod +x /usr/bin/ikaros - chmod +x /usr/bin/vanilla-sideload + - chmod +x /usr/bin/vso # custom binaries - chmod +x /usr/bin/abroot - - chmod +x /usr/bin/vso # core binaries - rm /usr/sbin/shutdown @@ -159,9 +158,6 @@ stages: - chmod +x /usr/bin/os-shell - chmod +x /usr/bin/host-shell - # distrobox links - - sh /usr/share/apx/distrobox/gen-distrobox-links - - name: cleanup type: shell commands: