From 557798e66e3a5a604fe2e6d0cd7854e10b96c54d Mon Sep 17 00:00:00 2001 From: Fierelier Date: Wed, 10 Aug 2022 02:00:49 +0200 Subject: [PATCH] Remake --- .gitignore | 1 - README.md | 2 +- make-os | 76 ------- make-os-proprietary | 78 ------- modlists/base | 6 + modlists/finish | 2 + modlists/graphical | 1 + modlists/graphical-xfce4 | 1 + modlists/hardware | 3 + modlists/hardware-live | 1 + modlists/hardware-proprietary | 2 + mods/clean-logs/modscript | 2 - mods/firmware-free/modscript | 2 - mods/firmware-proprietary/modscript | 4 +- mods/firmware/modscript | 2 + .../data/etc/skel/.bash_profile | 0 .../data/etc/skel/.config/Mousepad/accels.scm | 0 .../Audio settings - save (logout).desktop | 0 .../Audio settings - save (restart).desktop | 0 .../Audio settings - save (shutdown).desktop | 0 .../autostart/Lock screen on standby.desktop | 0 .../skel/.config/autostart/lockscreen.desktop | 0 .../.config/autostart/xscreensaver.desktop | 0 .../data/etc/skel/.config/dconf/user | Bin .../data/etc/skel/.xsessionrc | 0 .../data/usr/bin/opus-dvn_lock | 0 mods/graphical-general/modscript | 3 + .../data/etc/skel/.config/Thunar/accels.scm | 0 .../data/etc/skel/.config/Thunar/uca.xml | 0 .../xfce4/desktop/icons.screen.latest.rc | 0 .../xfce4/desktop/icons.screen0-1008x724.rc | 0 .../xfce4/desktop/icons.screen0-1008x725.rc | 0 .../skel/.config/xfce4/panel/whiskermenu-7.rc | 0 .../skel/.config/xfce4/terminal/accels.scm | 0 .../skel/.config/xfce4/terminal/terminalrc | 0 .../xfconf/xfce-perchannel-xml/thunar.xml | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-notifyd.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce4-power-manager.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 mods/graphical-xfce4/modscript | 2 + mods/grub/modscript | 2 +- mods/image-raw/data/setupdisk | 7 - mods/image-raw/modscript | 2 - mods/kernel/modscript | 2 +- mods/live-boot/modscript | 2 + mods/oobe/data/bin/login | 198 ++++++------------ .../oobe/setupComplete/.wdvn-placeholder} | 0 mods/oobe/modscript | 3 +- mods/packages-apply/data/chroot | 11 +- mods/packages-apply/modscript | 7 + mods/packages-base/modscript | 2 + mods/packages-graphical/modscript | 3 - mods/placeholders-remove/modscript | 2 + mods/sources-proprietary/modscript | 12 ++ mods/sources/modscript | 12 +- .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 .../{.opus-placeholder => .wdvn-placeholder} | 0 notes | 111 ++++++++++ path/apply-mod | 22 -- path/env-amd64 | 4 - path/env-i386 | 4 - path/env-proprietary | 14 -- path/fchroot | 8 - path/fchroot-end | 5 - path/make-base | 9 - path/make-image-gz | 4 - path/make-image-raw | 75 ------- path/wdvn-chroot | 14 ++ path/wdvn-chroot-end | 4 + path/wdvn-clean | 3 + path/wdvn-get | 3 + path/wdvn-image-gz | 3 + path/wdvn-image-iso | 94 +++++++++ path/wdvn-image-iso (copy 1) | 88 ++++++++ path/wdvn-make | 12 ++ path/wdvn-mod | 14 ++ path/wdvn-test | 2 + shell | 32 +-- 89 files changed, 489 insertions(+), 489 deletions(-) delete mode 100644 .gitignore delete mode 100755 make-os delete mode 100755 make-os-proprietary create mode 100644 modlists/base create mode 100644 modlists/finish create mode 100644 modlists/graphical create mode 100644 modlists/graphical-xfce4 create mode 100644 modlists/hardware create mode 100644 modlists/hardware-live create mode 100644 modlists/hardware-proprietary delete mode 100755 mods/clean-logs/modscript delete mode 100755 mods/firmware-free/modscript create mode 100755 mods/firmware/modscript rename mods/{packages-graphical => graphical-general}/data/etc/skel/.bash_profile (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/Mousepad/accels.scm (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/autostart/Lock screen on standby.desktop (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/autostart/lockscreen.desktop (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/autostart/xscreensaver.desktop (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.config/dconf/user (100%) rename mods/{user-config => graphical-general}/data/etc/skel/.xsessionrc (100%) rename mods/{packages-graphical => graphical-general}/data/usr/bin/opus-dvn_lock (100%) create mode 100755 mods/graphical-general/modscript rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/Thunar/accels.scm (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/Thunar/uca.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/terminal/accels.scm (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/terminal/terminalrc (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename mods/{user-config => graphical-xfce4}/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) create mode 100755 mods/graphical-xfce4/modscript delete mode 100755 mods/image-raw/data/setupdisk delete mode 100755 mods/image-raw/modscript create mode 100755 mods/live-boot/modscript rename mods/{image-raw/data/isRawImage => oobe/data/oobe/setupComplete/.wdvn-placeholder} (100%) mode change 100755 => 100644 mods/oobe/modscript create mode 100644 mods/packages-apply/modscript create mode 100644 mods/packages-base/modscript delete mode 100755 mods/packages-graphical/modscript create mode 100644 mods/placeholders-remove/modscript create mode 100755 mods/sources-proprietary/modscript rename mods/user-config/data/etc/skel/Desktop/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Documents/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Downloads/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Music/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Pictures/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Public/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Templates/{.opus-placeholder => .wdvn-placeholder} (100%) rename mods/user-config/data/etc/skel/Videos/{.opus-placeholder => .wdvn-placeholder} (100%) create mode 100644 notes delete mode 100755 path/apply-mod delete mode 100755 path/env-amd64 delete mode 100755 path/env-i386 delete mode 100755 path/env-proprietary delete mode 100755 path/fchroot delete mode 100755 path/fchroot-end delete mode 100755 path/make-base delete mode 100755 path/make-image-gz delete mode 100755 path/make-image-raw create mode 100755 path/wdvn-chroot create mode 100755 path/wdvn-chroot-end create mode 100755 path/wdvn-clean create mode 100755 path/wdvn-get create mode 100755 path/wdvn-image-gz create mode 100755 path/wdvn-image-iso create mode 100755 path/wdvn-image-iso (copy 1) create mode 100755 path/wdvn-make create mode 100755 path/wdvn-mod create mode 100755 path/wdvn-test diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 95563ae..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -chroots/ diff --git a/README.md b/README.md index b1835a0..7a22f91 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# opus-dvn +# windvn Devuan Linux for Windows users ![Screenshot](assets/screenshot.png) diff --git a/make-os b/make-os deleted file mode 100755 index c5d9739..0000000 --- a/make-os +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -set -e -cd "$(dirname "$(realpath -s "$BASH_SOURCE")")" -source shell -source "env-$1" -set +e - -( - set -e - # export OPUS_OUTPUT="/media/zram" - export OPUS_IMAGEDIR_BASE="$OPUS_OUTPUT/$1/base" - export OPUS_IMAGEDIR_FINAL="$OPUS_OUTPUT/$1/final" - export OPUS_PACKAGES="" - export OPUS_PACKAGES_INTERACTIVE="" - export OPUS_PACKAGES_DL="" - export OPUS_PACKAGES_REMOVE="" - - # Base - if [ -d "$OPUS_IMAGEDIR_BASE-tmp" ]; then - rm -f -r "$OPUS_IMAGEDIR_BASE-tmp" - fi - - if ! [ -d "$OPUS_IMAGEDIR_BASE" ]; then - mkdir -p "$OPUS_IMAGEDIR_BASE-tmp" - make-base "$OPUS_IMAGEDIR_BASE-tmp" # Base image - source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR_BASE-tmp" - mv "$OPUS_IMAGEDIR_BASE-tmp" "$OPUS_IMAGEDIR_BASE" - fi - - if [ -d "$OPUS_IMAGEDIR_FINAL-tmp" ]; then - rm -f -r "$OPUS_IMAGEDIR_FINAL-tmp" - fi - - if ! [ -d "$OPUS_IMAGEDIR_FINAL" ]; then - echo "Copying base image ..." - cp -a "$OPUS_IMAGEDIR_BASE" "$OPUS_IMAGEDIR_FINAL-tmp" - echo "$OPUS_SOURCES" > "$OPUS_IMAGEDIR_FINAL-tmp/etc/apt/sources.list" - - # Hardware - source apply-mod "$OPUS_HOME/mods/kernel" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/firmware-free" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/grub" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Graphical - source apply-mod "$OPUS_HOME/mods/packages-graphical" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Overrides - source apply-mod "$OPUS_HOME/mods/hostname" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/user-config" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Raw image - # source apply-mod "$OPUS_HOME/mods/image-raw" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Packages - source apply-mod "$OPUS_HOME/mods/fast-dpkg" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/packages-apply" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Extra - source apply-mod "$OPUS_HOME/mods/oobe" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/clean-logs" "$OPUS_IMAGEDIR_FINAL-tmp" - mv "$OPUS_IMAGEDIR_FINAL-tmp" "$OPUS_IMAGEDIR_FINAL" - - # make-image-raw "$OPUS_IMAGEDIR_FINAL" "$OPUS_HOME/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" - # make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image - fi - - echo "" - echo "Done." -) -if [ $? != 0 ]; then - set +e - echo "Script execution ended due to error. Cleaning up..." - fchroot-end "$OPUS_IMAGEDIR" - echo "Script execution ended due to error." - exit 1 -fi \ No newline at end of file diff --git a/make-os-proprietary b/make-os-proprietary deleted file mode 100755 index 31d01cc..0000000 --- a/make-os-proprietary +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -set -e -cd "$(dirname "$(realpath -s "$BASH_SOURCE")")" -source shell -source "env-$1" -source "env-proprietary" -set +e - -( - set -e - # export OPUS_OUTPUT="/media/zram" - export OPUS_IMAGEDIR_BASE="$OPUS_OUTPUT/$1/base" - export OPUS_IMAGEDIR_FINAL="$OPUS_OUTPUT/$1/final-proprietary" - export OPUS_PACKAGES="" - export OPUS_PACKAGES_INTERACTIVE="" - export OPUS_PACKAGES_DL="" - export OPUS_PACKAGES_REMOVE="" - - # Base - if [ -d "$OPUS_IMAGEDIR_BASE-tmp" ]; then - rm -f -r "$OPUS_IMAGEDIR_BASE-tmp" - fi - - if ! [ -d "$OPUS_IMAGEDIR_BASE" ]; then - mkdir -p "$OPUS_IMAGEDIR_BASE-tmp" - make-base "$OPUS_IMAGEDIR_BASE-tmp" # Base image - source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR_BASE-tmp" - mv "$OPUS_IMAGEDIR_BASE-tmp" "$OPUS_IMAGEDIR_BASE" - fi - - if [ -d "$OPUS_IMAGEDIR_FINAL-tmp" ]; then - rm -f -r "$OPUS_IMAGEDIR_FINAL-tmp" - fi - - if ! [ -d "$OPUS_IMAGEDIR_FINAL" ]; then - echo "Copying base image ..." - cp -a "$OPUS_IMAGEDIR_BASE" "$OPUS_IMAGEDIR_FINAL-tmp" - echo "$OPUS_SOURCES" > "$OPUS_IMAGEDIR_FINAL-tmp/etc/apt/sources.list" - - # Hardware - source apply-mod "$OPUS_HOME/mods/kernel" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/firmware-free" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/firmware-proprietary" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/grub" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Graphical - source apply-mod "$OPUS_HOME/mods/packages-graphical" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Overrides - source apply-mod "$OPUS_HOME/mods/hostname" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/user-config" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Raw image - # source apply-mod "$OPUS_HOME/mods/image-raw" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Packages - source apply-mod "$OPUS_HOME/mods/fast-dpkg" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/packages-apply" "$OPUS_IMAGEDIR_FINAL-tmp" - - # Extra - source apply-mod "$OPUS_HOME/mods/oobe" "$OPUS_IMAGEDIR_FINAL-tmp" - source apply-mod "$OPUS_HOME/mods/clean-logs" "$OPUS_IMAGEDIR_FINAL-tmp" - mv "$OPUS_IMAGEDIR_FINAL-tmp" "$OPUS_IMAGEDIR_FINAL" - - # make-image-raw "$OPUS_IMAGEDIR_FINAL" "$OPUS_HOME/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" - # make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image - fi - - echo "" - echo "Done." -) -if [ $? != 0 ]; then - set +e - echo "Script execution ended due to error. Cleaning up..." - fchroot-end "$OPUS_IMAGEDIR" - echo "Script execution ended due to error." - exit 1 -fi \ No newline at end of file diff --git a/modlists/base b/modlists/base new file mode 100644 index 0000000..e309164 --- /dev/null +++ b/modlists/base @@ -0,0 +1,6 @@ +packages-base +hostname +sources +user-config +oobe +fast-dpkg \ No newline at end of file diff --git a/modlists/finish b/modlists/finish new file mode 100644 index 0000000..93d1760 --- /dev/null +++ b/modlists/finish @@ -0,0 +1,2 @@ +packages-apply +placeholders-remove \ No newline at end of file diff --git a/modlists/graphical b/modlists/graphical new file mode 100644 index 0000000..773c131 --- /dev/null +++ b/modlists/graphical @@ -0,0 +1 @@ +graphical-general \ No newline at end of file diff --git a/modlists/graphical-xfce4 b/modlists/graphical-xfce4 new file mode 100644 index 0000000..e453527 --- /dev/null +++ b/modlists/graphical-xfce4 @@ -0,0 +1 @@ +graphical-xfce4 \ No newline at end of file diff --git a/modlists/hardware b/modlists/hardware new file mode 100644 index 0000000..01ef3da --- /dev/null +++ b/modlists/hardware @@ -0,0 +1,3 @@ +kernel +firmware +grub \ No newline at end of file diff --git a/modlists/hardware-live b/modlists/hardware-live new file mode 100644 index 0000000..56573d1 --- /dev/null +++ b/modlists/hardware-live @@ -0,0 +1 @@ +live-boot \ No newline at end of file diff --git a/modlists/hardware-proprietary b/modlists/hardware-proprietary new file mode 100644 index 0000000..b4bf193 --- /dev/null +++ b/modlists/hardware-proprietary @@ -0,0 +1,2 @@ +sources-proprietary +firmware-proprietary \ No newline at end of file diff --git a/mods/clean-logs/modscript b/mods/clean-logs/modscript deleted file mode 100755 index c6207bb..0000000 --- a/mods/clean-logs/modscript +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -find "$1/var/log" -type f -delete \ No newline at end of file diff --git a/mods/firmware-free/modscript b/mods/firmware-free/modscript deleted file mode 100755 index f8ee996..0000000 --- a/mods/firmware-free/modscript +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -export OPUS_PACKAGES="$OPUS_PACKAGES firmware-linux-free firmware-ath9k-htc" \ No newline at end of file diff --git a/mods/firmware-proprietary/modscript b/mods/firmware-proprietary/modscript index e04aac2..fd152ab 100755 --- a/mods/firmware-proprietary/modscript +++ b/mods/firmware-proprietary/modscript @@ -7,7 +7,5 @@ function sfp { packages="$packages ${packageinfo[0]}" fi done <<<$(apt-cache search "$1") - echo "${packages//"firmware-ipw2x00"/""}" } -export OPUS_PACKAGES="$OPUS_PACKAGES firmware-linux firmware-misc-nonfree $(sfp wireless) $(sfp wifi) $(sfp net)" -export OPUS_PACKAGES_INTERACTIVE="$OPUS_PACKAGES_INTERACTIVE firmware-ipw2x00" \ No newline at end of file +export WDVN_PACKAGES="$WDVN_PACKAGES firmware-linux firmware-misc-nonfree $(sfp wireless) $(sfp wifi) $(sfp net) firmware-ipw2x00" \ No newline at end of file diff --git a/mods/firmware/modscript b/mods/firmware/modscript new file mode 100755 index 0000000..1344034 --- /dev/null +++ b/mods/firmware/modscript @@ -0,0 +1,2 @@ +#!/bin/bash +export WDVN_PACKAGES="$WDVN_PACKAGES firmware-linux-free firmware-ath9k-htc" \ No newline at end of file diff --git a/mods/packages-graphical/data/etc/skel/.bash_profile b/mods/graphical-general/data/etc/skel/.bash_profile similarity index 100% rename from mods/packages-graphical/data/etc/skel/.bash_profile rename to mods/graphical-general/data/etc/skel/.bash_profile diff --git a/mods/user-config/data/etc/skel/.config/Mousepad/accels.scm b/mods/graphical-general/data/etc/skel/.config/Mousepad/accels.scm similarity index 100% rename from mods/user-config/data/etc/skel/.config/Mousepad/accels.scm rename to mods/graphical-general/data/etc/skel/.config/Mousepad/accels.scm diff --git a/mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop b/mods/graphical-general/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop similarity index 100% rename from mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop rename to mods/graphical-general/data/etc/skel/.config/autostart/Audio settings - save (logout).desktop diff --git a/mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop b/mods/graphical-general/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop similarity index 100% rename from mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop rename to mods/graphical-general/data/etc/skel/.config/autostart/Audio settings - save (restart).desktop diff --git a/mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop b/mods/graphical-general/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop similarity index 100% rename from mods/user-config/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop rename to mods/graphical-general/data/etc/skel/.config/autostart/Audio settings - save (shutdown).desktop diff --git a/mods/user-config/data/etc/skel/.config/autostart/Lock screen on standby.desktop b/mods/graphical-general/data/etc/skel/.config/autostart/Lock screen on standby.desktop similarity index 100% rename from mods/user-config/data/etc/skel/.config/autostart/Lock screen on standby.desktop rename to mods/graphical-general/data/etc/skel/.config/autostart/Lock screen on standby.desktop diff --git a/mods/user-config/data/etc/skel/.config/autostart/lockscreen.desktop b/mods/graphical-general/data/etc/skel/.config/autostart/lockscreen.desktop similarity index 100% rename from mods/user-config/data/etc/skel/.config/autostart/lockscreen.desktop rename to mods/graphical-general/data/etc/skel/.config/autostart/lockscreen.desktop diff --git a/mods/user-config/data/etc/skel/.config/autostart/xscreensaver.desktop b/mods/graphical-general/data/etc/skel/.config/autostart/xscreensaver.desktop similarity index 100% rename from mods/user-config/data/etc/skel/.config/autostart/xscreensaver.desktop rename to mods/graphical-general/data/etc/skel/.config/autostart/xscreensaver.desktop diff --git a/mods/user-config/data/etc/skel/.config/dconf/user b/mods/graphical-general/data/etc/skel/.config/dconf/user similarity index 100% rename from mods/user-config/data/etc/skel/.config/dconf/user rename to mods/graphical-general/data/etc/skel/.config/dconf/user diff --git a/mods/user-config/data/etc/skel/.xsessionrc b/mods/graphical-general/data/etc/skel/.xsessionrc similarity index 100% rename from mods/user-config/data/etc/skel/.xsessionrc rename to mods/graphical-general/data/etc/skel/.xsessionrc diff --git a/mods/packages-graphical/data/usr/bin/opus-dvn_lock b/mods/graphical-general/data/usr/bin/opus-dvn_lock similarity index 100% rename from mods/packages-graphical/data/usr/bin/opus-dvn_lock rename to mods/graphical-general/data/usr/bin/opus-dvn_lock diff --git a/mods/graphical-general/modscript b/mods/graphical-general/modscript new file mode 100755 index 0000000..29fc4a9 --- /dev/null +++ b/mods/graphical-general/modscript @@ -0,0 +1,3 @@ +#!/bin/bash +export WDVN_PACKAGES_DL="$WDVN_PACKAGES_DL mousepad netsurf-gtk xautolock xsecurelock qt5-style-plugins alsa-utils synaptic epiphany-browser" +export WDVN_PACKAGES_REMOVE="$WDVN_PACKAGES_REMOVE xscreensaver" \ No newline at end of file diff --git a/mods/user-config/data/etc/skel/.config/Thunar/accels.scm b/mods/graphical-xfce4/data/etc/skel/.config/Thunar/accels.scm similarity index 100% rename from mods/user-config/data/etc/skel/.config/Thunar/accels.scm rename to mods/graphical-xfce4/data/etc/skel/.config/Thunar/accels.scm diff --git a/mods/user-config/data/etc/skel/.config/Thunar/uca.xml b/mods/graphical-xfce4/data/etc/skel/.config/Thunar/uca.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/Thunar/uca.xml rename to mods/graphical-xfce4/data/etc/skel/.config/Thunar/uca.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc diff --git a/mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x724.rc diff --git a/mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/desktop/icons.screen0-1008x725.rc diff --git a/mods/user-config/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/panel/whiskermenu-7.rc diff --git a/mods/user-config/data/etc/skel/.config/xfce4/terminal/accels.scm b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/terminal/accels.scm similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/terminal/accels.scm rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/terminal/accels.scm diff --git a/mods/user-config/data/etc/skel/.config/xfce4/terminal/terminalrc b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/terminal/terminalrc similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/terminal/terminalrc rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/terminal/terminalrc diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from mods/user-config/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/mods/graphical-xfce4/modscript b/mods/graphical-xfce4/modscript new file mode 100755 index 0000000..930ddba --- /dev/null +++ b/mods/graphical-xfce4/modscript @@ -0,0 +1,2 @@ +#!/bin/bash +export WDVN_PACKAGES_DL="$WDVN_PACKAGES_DL xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse network-manager-gnome xfce4-terminal xfce4-screenshooter" \ No newline at end of file diff --git a/mods/grub/modscript b/mods/grub/modscript index 9eb0f19..944047c 100755 --- a/mods/grub/modscript +++ b/mods/grub/modscript @@ -1,2 +1,2 @@ #!/bin/bash -export OPUS_PACKAGES="$OPUS_PACKAGES grub2" \ No newline at end of file +export WDVN_PACKAGES="$WDVN_PACKAGES grub2" \ No newline at end of file diff --git a/mods/image-raw/data/setupdisk b/mods/image-raw/data/setupdisk deleted file mode 100755 index 03b3897..0000000 --- a/mods/image-raw/data/setupdisk +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e -echo "GRUB_DISABLE_OS_PROBER=true" >>/etc/default/grub -grub-install --boot-directory="/boot" --modules=part_msdos "${DISK_LOOP}" -update-grub -sed -i 's/GRUB_DISABLE_OS_PROBER=true/# GRUB_DISABLE_OS_PROBER=true/' /etc/default/grub -rm /setupdisk \ No newline at end of file diff --git a/mods/image-raw/modscript b/mods/image-raw/modscript deleted file mode 100755 index c9d96d7..0000000 --- a/mods/image-raw/modscript +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -export OPUS_PACKAGES="$OPUS_PACKAGES cloud-utils" \ No newline at end of file diff --git a/mods/kernel/modscript b/mods/kernel/modscript index c2a795a..9592bc8 100755 --- a/mods/kernel/modscript +++ b/mods/kernel/modscript @@ -1,2 +1,2 @@ #!/usr/bin/env bash -export OPUS_PACKAGES="$OPUS_PACKAGES $OPUS_LINUX" \ No newline at end of file +export WDVN_PACKAGES="$WDVN_PACKAGES $WDVN_KERNEL" \ No newline at end of file diff --git a/mods/live-boot/modscript b/mods/live-boot/modscript new file mode 100755 index 0000000..0ec1e7f --- /dev/null +++ b/mods/live-boot/modscript @@ -0,0 +1,2 @@ +#!/bin/bash +export WDVN_PACKAGES="$WDVN_PACKAGES live-boot live-boot-initramfs-tools" \ No newline at end of file diff --git a/mods/oobe/data/bin/login b/mods/oobe/data/bin/login index 9d35197..e81f056 100755 --- a/mods/oobe/data/bin/login +++ b/mods/oobe/data/bin/login @@ -1,143 +1,67 @@ -#!/usr/bin/env python3 -# This script is ran when booting into the OS, and the setup isn't finished -import os -import traceback -import subprocess -debug = False -os.environ["PATH"] = "/sbin:/usr/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" - -def procWait(proc): - rtn = proc.wait() - if debug: print(rtn) - if rtn != 0: raise processError - -def call(*args,**kwargs): - if debug: print(str(args[0])) - proc = subprocess.Popen(*args,**kwargs) - procWait(proc) - -def callo(*args,**kwargs): - data = b"" - proc = subprocess.Popen(*args,**kwargs,stdout=subprocess.PIPE) - while True: - b = proc.stdout.read() - if b == b"": break - data += b - procWait(proc) - return data.decode("utf-8") - -def mchoice(choices): - while True: - choice = input("Choice: ").lower() - if not choice in choices: continue - return choice - -def main(): - while True: - print("Welcome to opus-dvn.") - print("1: Finish installation") - print("2: Clone to other device") - print("3: Open bash") - print("4: Shut down") - choice = mchoice(["1","2","3","4"]) - if choice == "1": - if os.path.isfile("/isRawImage"): - print("Resizing / to fill disk...") - dev = callo(["findmnt","-n","-o","SOURCE","/"]).strip("\t\r\n") - disk = dev[:-1] - part = dev[-1] - call(["growpart",disk,part]) - call(["resize2fs",dev]) - os.remove("/isRawImage") - call(["dpkg-reconfigure","keyboard-configuration"]) - call(["udevadm","trigger","--subsystem-match=input","--action=change"]) - call(["apt","install","console-setup","locales","tzdata","--yes"]) - call(["dpkg-reconfigure","locales"]) - call(["dpkg-reconfigure","tzdata"]) - - print("") - hostname = input("Hostname: ") - with open("/etc/hosts","w",encoding="utf-8") as fh: - fh.write("""\ -127.0.0.1 localhost +#!/bin/bash +export PATH="/sbin:/usr/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" +CHOICE=1 +while true; do + echo "Welcome to windvn!" + echo "1: Finish installation" + echo "2: Open bash" + echo "3: Shut down" + read -p "Choice: " CHOICE + echo "" + + if [ "$CHOICE" == "1" ]; then + dpkg-reconfigure keyboard-configuration + udevadm trigger --subsystem-match=input --action=change + apt -y install console-setup locales tzdata + dpkg-reconfigure locales + dpkg-reconfigure tzdata + groupadd -f sudo + + while true; do + read -p "First user (Administrator): " NEW_USER + ( + set -e + adduser --gecos "" "$NEW_USER" + usermod -a -G sudo "$NEW_USER" + ) + if [ "$?" == "0" ]; then + break + else + deluser --remove-home "$NEW_USER" + echo "" + fi + done + + for file in "/oobe/setupComplete"/*; do + if [[ -x "$file" ]]; then + source "$file" + fi + done + + echo "$HOSTNAME" > /etc/hostname + + echo "127.0.0.1 localhost 127.0.1.1 $HOSTNAME # The following lines are desirable for IPv6 capable hosts ::1 localhost ip6-localhost ip6-loopback ff02::1 ip6-allnodes -ff02::2 ip6-allrouters\ -""".replace("$HOSTNAME",hostname) - ) - with open("/etc/hostname","w",encoding="utf-8") as fh: - fh.write(hostname) - os.environ["HOSTNAME"] = hostname - - print("") - print("Configure your network now, using nmtui? (y/n)") - if mchoice(["y","n"]) == "y": call(["nmtui"]) - - print("") - call(["groupadd","-f","sudo"]) - username = False - while True: - username = input("First user (Administrator): ").lower().strip(" ") - if username == "root": continue - - print("Encrypt user? Recommended for machines that may be stolen or spying relatives. (y/n)") - encrypt = mchoice(["y","n"]) - ucommand = ["adduser"] - ucommand = ucommand + ["--gecos","",username] - - try: - call(["id","-u",username]) - except: - try: - call(ucommand) - except: - try: - call(["deluser","--remove-home",username]) - except: - continue - - try: - call(["usermod","-a","-G","sudo",username]) - except: - print("Warning: Couldn't add user to sudo group!") - - if encrypt == "y": - call(["modprobe","ecryptfs"]) - with open("/etc/modules","a",encoding="utf-8") as mfile: - mfile.write("ecryptfs\n") - call(["ecryptfs-migrate-home","-u",username]) - for root,dirs,files in os.walk("/home"): - for files in dirs: - ffile = os.path.join(root,file) - lfile = ffile.replace("/home/","",1) - if lfile.startswith(username + "."): - shutil.rmtree(ffile) - break - break - - print("") - print("Booting into new environment ...") - os.remove("/bin/login") - os.rename("/bin/login.bak","/bin/login") - return +ff02::2 ip6-allrouters +" > /etc/hosts - if choice == "2": - print("Not implemented.") - continue - - if choice == "3": - call(["bash"]) - return - - if choice == "4": - call(["poweroff"]) - return - -try: - main() -except: - print(traceback.format_exc()) - input("Press RETURN to quit.") + rm "/bin/login" + mv "/bin/login.bak" "/bin/login" + exit + fi + + if [ "$CHOICE" == "2" ]; then + bash + fi + + if [ "$CHOICE" == "3" ]; then + poweroff + exit + fi + + echo "" +done \ No newline at end of file diff --git a/mods/image-raw/data/isRawImage b/mods/oobe/data/oobe/setupComplete/.wdvn-placeholder similarity index 100% rename from mods/image-raw/data/isRawImage rename to mods/oobe/data/oobe/setupComplete/.wdvn-placeholder diff --git a/mods/oobe/modscript b/mods/oobe/modscript old mode 100755 new mode 100644 index 43af6cd..bfb55f8 --- a/mods/oobe/modscript +++ b/mods/oobe/modscript @@ -1,3 +1,2 @@ #!/bin/bash -export OPUS_PACKAGES="$OPUS_PACKAGES sudo keyboard-configuration network-manager python3 cloud-utils ecryptfs-utils rsync lsof" -export OPUS_PACKAGES_DL="$OPUS_PACKAGES console-setup locales tzdata" \ No newline at end of file +cp "$1/bin/login" "$1/bin/login.bak" \ No newline at end of file diff --git a/mods/packages-apply/data/chroot b/mods/packages-apply/data/chroot index f52726e..d90e6a5 100755 --- a/mods/packages-apply/data/chroot +++ b/mods/packages-apply/data/chroot @@ -1,10 +1,13 @@ #!/bin/bash +set -e +cat << EOF | debconf-set-selections +firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true +EOF apt -y update apt -y upgrade +apt -y install $WDVN_PACKAGES_INTERACTIVE export DEBIAN_FRONTEND="noninteractive" -apt -y install $OPUS_PACKAGES -apt -y install --download-only $OPUS_PACKAGES_DL +apt -y install $WDVN_PACKAGES +apt -y install --download-only $WDVN_PACKAGES_DL unset DEBIAN_FRONTEND -apt -y install $OPUS_PACKAGES_INTERACTIVE -apt -y remove $OPUS_PACKAGES_REMOVE apt -y autoclean \ No newline at end of file diff --git a/mods/packages-apply/modscript b/mods/packages-apply/modscript new file mode 100644 index 0000000..387d533 --- /dev/null +++ b/mods/packages-apply/modscript @@ -0,0 +1,7 @@ +#!/bin/bash +echo "#!/bin/bash +apt -y install $WDVN_PACKAGES_DL +apt -y remove $WDVN_PACKAGES_REMOVE +apt -y autoclean +" >"$1/oobe/setupComplete/00-packages" +chmod +x "$1/oobe/setupComplete/00-packages" diff --git a/mods/packages-base/modscript b/mods/packages-base/modscript new file mode 100644 index 0000000..fd091af --- /dev/null +++ b/mods/packages-base/modscript @@ -0,0 +1,2 @@ +#!/bin/bash +export WDVN_PACKAGES="$WDVN_PACKAGES sudo" \ No newline at end of file diff --git a/mods/packages-graphical/modscript b/mods/packages-graphical/modscript deleted file mode 100755 index 91a1dec..0000000 --- a/mods/packages-graphical/modscript +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export OPUS_PACKAGES="$OPUS_PACKAGES xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse network-manager-gnome xfce4-terminal xfce4-screenshooter mousepad netsurf-gtk xautolock xsecurelock qt5-style-plugins alsa-utils synaptic epiphany-browser" -export OPUS_PACKAGES_REMOVE="$OPUS_PACKAGES_REMOVE xscreensaver" \ No newline at end of file diff --git a/mods/placeholders-remove/modscript b/mods/placeholders-remove/modscript new file mode 100644 index 0000000..2e396ca --- /dev/null +++ b/mods/placeholders-remove/modscript @@ -0,0 +1,2 @@ +#!/bin/bash +find "$1" -name ".wdvn-placeholder" -type f -delete \ No newline at end of file diff --git a/mods/sources-proprietary/modscript b/mods/sources-proprietary/modscript new file mode 100755 index 0000000..69c62cb --- /dev/null +++ b/mods/sources-proprietary/modscript @@ -0,0 +1,12 @@ +#!/bin/bash +echo "deb $WDVN_URL $WDVN_VER main contrib non-free +# deb-src $WDVN_URL $WDVN_VER main contrib non-free + +deb $WDVN_URL $WDVN_VER-security main contrib non-free +# deb-src $WDVN_URL $WDVN_VER-security main contrib non-free + +# chimaera-updates, to get updates before a point release is made; +# see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates> +# deb $WDVN_URL $WDVN_VER-updates main contrib non-free +# deb-src $WDVN_URL $WDVN_VER-updates main contrib non-free +" >"$1/etc/apt/sources.list" \ No newline at end of file diff --git a/mods/sources/modscript b/mods/sources/modscript index d5ac719..8a49532 100755 --- a/mods/sources/modscript +++ b/mods/sources/modscript @@ -1,2 +1,12 @@ #!/bin/bash -echo "$OPUS_SOURCES" >"$1/etc/apt/sources.list" \ No newline at end of file +echo "deb $WDVN_URL $WDVN_VER main +# deb-src $WDVN_URL $WDVN_VER main + +deb $WDVN_URL $WDVN_VER-security main +# deb-src $WDVN_URL $WDVN_VER-security main + +# chimaera-updates, to get updates before a point release is made; +# see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates> +# deb $WDVN_URL $WDVN_VER-updates main +# deb-src $WDVN_URL $WDVN_VER-updates main +" >"$1/etc/apt/sources.list" \ No newline at end of file diff --git a/mods/user-config/data/etc/skel/Desktop/.opus-placeholder b/mods/user-config/data/etc/skel/Desktop/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Desktop/.opus-placeholder rename to mods/user-config/data/etc/skel/Desktop/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Documents/.opus-placeholder b/mods/user-config/data/etc/skel/Documents/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Documents/.opus-placeholder rename to mods/user-config/data/etc/skel/Documents/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Downloads/.opus-placeholder b/mods/user-config/data/etc/skel/Downloads/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Downloads/.opus-placeholder rename to mods/user-config/data/etc/skel/Downloads/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Music/.opus-placeholder b/mods/user-config/data/etc/skel/Music/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Music/.opus-placeholder rename to mods/user-config/data/etc/skel/Music/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Pictures/.opus-placeholder b/mods/user-config/data/etc/skel/Pictures/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Pictures/.opus-placeholder rename to mods/user-config/data/etc/skel/Pictures/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Public/.opus-placeholder b/mods/user-config/data/etc/skel/Public/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Public/.opus-placeholder rename to mods/user-config/data/etc/skel/Public/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Templates/.opus-placeholder b/mods/user-config/data/etc/skel/Templates/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Templates/.opus-placeholder rename to mods/user-config/data/etc/skel/Templates/.wdvn-placeholder diff --git a/mods/user-config/data/etc/skel/Videos/.opus-placeholder b/mods/user-config/data/etc/skel/Videos/.wdvn-placeholder similarity index 100% rename from mods/user-config/data/etc/skel/Videos/.opus-placeholder rename to mods/user-config/data/etc/skel/Videos/.wdvn-placeholder diff --git a/notes b/notes new file mode 100644 index 0000000..78a438c --- /dev/null +++ b/notes @@ -0,0 +1,111 @@ +- to get packages, and their size in kb: dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n +- to get package's files: dpkg -L package +- to get folder size: du -hs directory + +31M /usr/share/locale +13M /usr/share/doc +21M apt remove apt tzdata libgnutls30 grep diffutils findutils e2fsprogs libapt-pkg6.0 + +default packages in devuan minbase: +26 libaudit-common +34 libtirpc-common +36 libsemanage-common +47 libcap-ng0 +49 hostname +49 lsb-base +50 libkeyutils1 +52 libattr1 +56 libffi7 +64 devuan-keyring +65 startpar +73 libdebconfclient0 +74 libacl1 +77 sysvinit-utils +81 sysv-rc +88 bootlogd +93 libcom-err2 +93 logsave +104 libbz2-1.0 +109 libss2 +126 libnsl2 +128 libtasn1-6 +131 init-system-helpers +133 libxxhash0 +134 libgcc-s1 +143 libuuid1 +154 libaudit1 +157 insserv +160 liblz4-1 +161 libseccomp2 +169 zlib1g +171 libkrb5support0 +176 initscripts +195 libgpg-error0 +223 debianutils +224 dash +226 libselinux1 +232 libeudev1 +234 debian-archive-keyring +234 libpam-modules-bin +242 base-passwd +245 gzip +248 libtirpc3 +250 libcrypt1 +252 libpam0g +253 mawk +261 gcc-10-base +262 gcc-9-base +272 sysvinit-core +292 liblzma5 +304 libidn2-0 +307 libk5crypto3 +336 libsemanage1 +362 libsmartcols1 +378 base-files +385 ncurses-base +415 bsdutils +452 mount +453 libhogweed6 +471 libblkid1 +480 libgssapi-krb5-2 +491 libnettle8 +517 debconf +518 libtinfo6 +539 libmount1 +634 ncurses-bin +639 libext2fs2 +685 libpcre3 +687 libpcre2-8-0 +849 adduser +849 libsepol1 +864 libzstd1 +886 sed +922 libgmp10 +961 gpgv +965 libpam-runtime +1084 libpam-modules +1098 grep +1124 libgcrypt20 +1126 libkrb5-3 +1530 libp11-kit0 +1579 e2fsprogs +1591 libunistring2 +1606 diffutils +1993 findutils +2032 libdb5.3 +2326 login +2344 libstdc++6 +2746 passwd +3224 tar +3297 libgnutls30 +3409 tzdata +3448 libapt-pkg6.0 +3567 libc-bin +3959 libssl1.1 +4269 apt +4609 util-linux +6597 bash +7091 dpkg +7934 perl-base +12217 libc6 +17657 coreutils diff --git a/path/apply-mod b/path/apply-mod deleted file mode 100755 index cb5941e..0000000 --- a/path/apply-mod +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -e -if [ -f "$1/data/bin/login" ]; then - if [ -f "$2/bin/login.bak" ]; then - rm "$2/bin/login" - else - mv "$2/bin/login" "$2/bin/login.bak" - fi -fi - -if [ -d "$1/data" ]; then - cp -rf "$1/data/." "$2" -fi - -if [ -f "$2/chroot" ]; then - fchroot "$2" "/chroot" - rm "$2/chroot" -fi - -if [ -f "$1/modscript" ]; then - source "$1/modscript" "$2" -fi \ No newline at end of file diff --git a/path/env-amd64 b/path/env-amd64 deleted file mode 100755 index 802d56a..0000000 --- a/path/env-amd64 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -e -export OPUS_ARCH=amd64 -export OPUS_LINUX=linux-image-amd64 \ No newline at end of file diff --git a/path/env-i386 b/path/env-i386 deleted file mode 100755 index c9bba28..0000000 --- a/path/env-i386 +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -e -export OPUS_ARCH=i386 -export OPUS_LINUX=linux-image-686 \ No newline at end of file diff --git a/path/env-proprietary b/path/env-proprietary deleted file mode 100755 index bacb376..0000000 --- a/path/env-proprietary +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -e -export OPUS_SOURCES="deb http://deb.devuan.org/merged $OPUS_DIST main contrib non-free -# deb-src http://deb.devuan.org/merged $OPUS_DIST main contrib non-free - -deb http://pkgmaster.devuan.org/merged $OPUS_DIST-security main contrib non-free -# deb-src http://pkgmaster.devuan.org/merged $OPUS_DIST-security main contrib non-free - -# chimaera-updates, to get updates before a point release is made; -# see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates> -# deb http://deb.devuan.org/merged $OPUS_DIST-updates main contrib non-free -# deb-src http://deb.devuan.org/merged $OPUS_DIST-updates main contrib non-free -" -export OPUS_NAME="opus-dvn-proprietary" \ No newline at end of file diff --git a/path/fchroot b/path/fchroot deleted file mode 100755 index f09e9ba..0000000 --- a/path/fchroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -e -mount -o bind "/dev" "$1/dev" -mount -o bind "/dev/pts" "$1/dev/pts" -mount -o bind "/sys" "$1/sys" -mount -o bind "/proc" "$1/proc" -chroot "$1" ${@:2} -fchroot-end "$1" \ No newline at end of file diff --git a/path/fchroot-end b/path/fchroot-end deleted file mode 100755 index 3785f34..0000000 --- a/path/fchroot-end +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -umount -l "$1/proc" -umount -l "$1/sys" -umount -l "$1/dev/pts" -umount -l "$1/dev" \ No newline at end of file diff --git a/path/make-base b/path/make-base deleted file mode 100755 index ecf2211..0000000 --- a/path/make-base +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -e -if [ -d "$1" ]; then - rm -rf "$1" -fi -mkdir "$1" -debootstrap --arch="$OPUS_ARCH" "$OPUS_DIST" "$1" "$OPUS_URL" -fchroot "$1" apt -y autoclean -find "$1/var/log" -type f -delete \ No newline at end of file diff --git a/path/make-image-gz b/path/make-image-gz deleted file mode 100755 index 11fdd3b..0000000 --- a/path/make-image-gz +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -e -cd "$OPUS_IMAGEDIR" -tar -czvf "$2" \ No newline at end of file diff --git a/path/make-image-raw b/path/make-image-raw deleted file mode 100755 index 7919ad9..0000000 --- a/path/make-image-raw +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env bash -set -e -export DISK_IMAGE="$2" -export ROOT_MOUNT="$1-mount" -set +e - -( - set -e - - # Get the approximate size required for the image - export DISK_SIZE=$(du -sb "$1" | cut -f1) - # Add 256MB for SWAP, and 700MB for overhead - export DISK_SIZE=$(( $DISK_SIZE + ( 256 * 1000000 ) + ( 700 * 1000000 ) )) - - # Create and mount disk - fallocate -l $DISK_SIZE "$DISK_IMAGE" - export DISK_LOOP="$(losetup --show -f -P "$DISK_IMAGE")" - - # Partition disk - ( - echo n - echo e - echo - echo - echo +256M - echo t - echo swap - echo n - echo p - echo - echo - echo - echo t - echo - echo linux - echo w - echo - echo - ) | fdisk "$DISK_LOOP" - - # Format partions - mkswap "${DISK_LOOP}p1" - mkfs.ext4 "${DISK_LOOP}p2" - - # Mount root - mkdir "$ROOT_MOUNT" - mount "${DISK_LOOP}p2" "$ROOT_MOUNT" - - # Add files - cp -a "$1/." "$ROOT_MOUNT" - - # Make fstab - echo "UUID=$(blkid -o value -s UUID "${DISK_LOOP}p1") none swap sw 0 0" >"$ROOT_MOUNT/etc/fstab" - echo "UUID=$(blkid -o value -s UUID "${DISK_LOOP}p2") / ext4 errors=remount-ro 0 1" >>"$ROOT_MOUNT/etc/fstab" - - # Set up GRUB and misc - fchroot "$ROOT_MOUNT" "/setupdisk" - - # Clear logs - find "$ROOT_MOUNT/var/log" -type f -delete - - # Unmount root - umount -l "$ROOT_MOUNT" - rmdir "$ROOT_MOUNT" - losetup -d "$DISK_LOOP" -) -if [ $? != 0 ]; then - echo - echo Script execution ended due to error. Cleaning up... - umount -l "$ROOT_MOUNT" - rmdir "$ROOT_MOUNT" - losetup -d "$DISK_LOOP" - echo Script execution ended due to error. - exit 1 -fi \ No newline at end of file diff --git a/path/wdvn-chroot b/path/wdvn-chroot new file mode 100755 index 0000000..29a6651 --- /dev/null +++ b/path/wdvn-chroot @@ -0,0 +1,14 @@ +#!/bin/bash +( + set -e + mount -o bind "/dev" "$1/dev" + mount -o bind "/dev/pts" "$1/dev/pts" + mount -t proc none "$1/proc" + chroot "$1" ${@:2} +) +if [ $? != 0 ]; then + wdvn-chroot-end "$1" + exit 1 +fi + +wdvn-chroot-end "$1" \ No newline at end of file diff --git a/path/wdvn-chroot-end b/path/wdvn-chroot-end new file mode 100755 index 0000000..9ba4957 --- /dev/null +++ b/path/wdvn-chroot-end @@ -0,0 +1,4 @@ +#!/bin/bash +umount -l "$1/proc" +umount -l "$1/dev/pts" +umount -l "$1/dev" \ No newline at end of file diff --git a/path/wdvn-clean b/path/wdvn-clean new file mode 100755 index 0000000..f574f17 --- /dev/null +++ b/path/wdvn-clean @@ -0,0 +1,3 @@ +#!/bin/bash +wdvn-chroot "$1" apt -y autoclean +find "$1/var/log" -type f -delete \ No newline at end of file diff --git a/path/wdvn-get b/path/wdvn-get new file mode 100755 index 0000000..d50761e --- /dev/null +++ b/path/wdvn-get @@ -0,0 +1,3 @@ +#!/bin/bash +set -e +debootstrap --arch="$WDVN_ARCH" "$WDVN_VER" "$1" "$WDVN_URL" \ No newline at end of file diff --git a/path/wdvn-image-gz b/path/wdvn-image-gz new file mode 100755 index 0000000..9ea0c3a --- /dev/null +++ b/path/wdvn-image-gz @@ -0,0 +1,3 @@ +#!/bin/bash +set -e +GZIP=-9 tar -czvf "$2" -C "$1" . \ No newline at end of file diff --git a/path/wdvn-image-iso b/path/wdvn-image-iso new file mode 100755 index 0000000..3bd64ff --- /dev/null +++ b/path/wdvn-image-iso @@ -0,0 +1,94 @@ +#!/bin/bash +set -e +DISC_NAME="$WDVN_NAME $WDVN_ARCH $WDVN_VER $WDVN_DATE" +CHROOT="$1" +IMAGE="$2.tmp" + +if [ -d "$IMAGE" ]; then + rm -r -f "$IMAGE" +fi + +EXIT=0 +if [ ! -d "/usr/lib/ISOLINUX" ]; then + echo "ERROR: /usr/lib/ISOLINUX not found. Run 'apt install isolinux'." + EXIT=1 +fi + +if [ ! -d "/usr/lib/syslinux" ]; then + echo "ERROR: /usr/lib/syslinux not found. Run 'apt install syslinux-common'." + EXIT=1 +fi + +if [ ! -d "$CHROOT/lib/live/boot" ]; then + echo "ERROR: /lib/live/boot not found within chroot. On your chroot, run 'apt install live-boot'." + EXIT=1 +fi + +if [ ! -f "$CHROOT/usr/share/initramfs-tools/hooks/live" ]; then + echo "ERROR: /usr/share/initramfs-tools/hooks/live not found within chroot. On your chroot, run 'apt install live-boot-initramfs-tools'." + EXIT=1 +fi + +if ! command -v xorriso &> /dev/null +then + echo "ERROR: xorriso not found. Run 'apt install xorriso'." + EXIT=1 +fi + + +if [ -f "$2" ]; then + echo "ERROR: $2 already exists." + EXIT=1 +fi + +if [ "$EXIT" == "1" ]; then + exit 1 +fi + +mkdir -p "$IMAGE" +mkdir -p "$IMAGE/live" +mkdir -p "$IMAGE/isolinux" + +cp -fv "$CHROOT/boot"/vmlinuz-* "$IMAGE/live/vmlinuz" +cp -fv "$CHROOT/boot"/initrd.img-* "$IMAGE/live/initrd.img" +mksquashfs "$CHROOT" "$IMAGE/live/filesystem.squashfs" + +echo "UI menu.c32 + +MENU TITLE $WDVN_NAME $WDVN_ARCH $WDVN_VER $WDVN_DATE live +TIMEOUT 600 + +LABEL linux + MENU LABEL Linux + KERNEL /live/vmlinuz + APPEND initrd=/live/initrd.img boot=live noautologin + +LABEL linux-nomodeset + MENU LABEL Linux (nomodeset) + KERNEL /live/vmlinuz + APPEND initrd=/live/initrd.img boot=live noautologin nomodeset +" > "$IMAGE/isolinux/isolinux.cfg" + +cp /usr/lib/ISOLINUX/isolinux.bin "$IMAGE/isolinux/" +cp /usr/lib/syslinux/modules/bios/* "$IMAGE/isolinux/" + +xorriso \ + -as mkisofs \ + -iso-level 3 \ + -full-iso9660-filenames \ + -volid "$DISC_NAME" \ + -output "$2" \ + -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \ + -eltorito-boot \ + isolinux/isolinux.bin \ + -no-emul-boot \ + -boot-load-size 4 \ + -boot-info-table \ + --eltorito-catalog isolinux/isolinux.cat \ + "$IMAGE" +# -eltorito-alt-boot \ +# -e /EFI/boot/efiboot.img \ +# -no-emul-boot \ +# -isohybrid-gpt-basdat \ +# -append_partition 2 0xef EFI/boot/efiboot.img \ +# "$IMAGE" \ No newline at end of file diff --git a/path/wdvn-image-iso (copy 1) b/path/wdvn-image-iso (copy 1) new file mode 100755 index 0000000..9ca6b79 --- /dev/null +++ b/path/wdvn-image-iso (copy 1) @@ -0,0 +1,88 @@ +#!/bin/bash +# https://gist.github.com/Sirherobrine23/6d680d3027a0b032fb950b1770f03a45 +set -e +set -x +DISC_NAME="Linux" +CHROOT="$1" +IMAGE="$2.tmp" +OLDPWD="$(pwd)" +mkdir -p "$IMAGE/casper" +mkdir -p "$IMAGE/isolinux" + +# Boot +cp -fv "$CHROOT/boot"/vmlinuz-* "$IMAGE/casper/vmlinuz" +cp -fv "$CHROOT/boot"/initrd.img-* "$IMAGE/casper/initrd" +# ------ +# +chroot "$CHROOT" dpkg-query -W --showformat='${Package} ${Version}\n' | tee "$IMAGE/casper/filesystem.manifest" +cp -v "$IMAGE/casper/filesystem.manifest" "$IMAGE/casper/filesystem.manifest-desktop" +sed -i '/ubiquity/d' "$IMAGE/casper/filesystem.manifest-desktop" +sed -i '/casper/d' "$IMAGE/casper/filesystem.manifest-desktop" +sed -i '/discover/d' "$IMAGE/casper/filesystem.manifest-desktop" +sed -i '/laptop-detect/d' "$IMAGE/casper/filesystem.manifest-desktop" +sed -i '/os-prober/d' "$IMAGE/casper/filesystem.manifest-desktop" + +# Create read-only +if [ -e "$IMAGE/casper/filesystem.squashfs" ];then + rm -rfv "$IMAGE/casper/filesystem.squashfs" +fi +mksquashfs "$CHROOT" "$IMAGE/casper/filesystem.squashfs" + +# squashFS Size +printf $(du -sx --block-size=1 "$CHROOT" | cut -f1) > "$IMAGE/casper/filesystem.size" + +# IMAGE DIR +# -------- +# README.diskdefines +echo "#define DISKNAME $DISC_NAME +#define TYPE binary +#define TYPEbinary 1 +#define ARCH amd64 +#define ARCHamd64 1 +#define DISKNUM 1 +#define DISKNUM1 1 +#define TOTALNUM 0 +#define TOTALNUM0 1" > "$IMAGE/README.diskdefines" + +echo 'UI menu.c32 + +MENU TITLE Boot Menu +DEFAULT linux +TIMEOUT 600 + +LABEL linux + MENU LABEL windvn live + MENU DEFAULT + KERNEL /casper/vmlinuz + APPEND initrd=/casper/initrd boot=casper selinux=disabled + +LABEL linux + MENU LABEL windvn live (nomodeset) + MENU DEFAULT + KERNEL /casper/vmlinuz + APPEND initrd=/casper/initrd boot=casper selinux=disabled nomodeset +' > "$IMAGE/isolinux/isolinux.cfg" + +cp /usr/lib/ISOLINUX/isolinux.bin "$IMAGE/isolinux/" +cp /usr/lib/syslinux/modules/bios/* "$IMAGE/isolinux/" + +xorriso \ + -as mkisofs \ + -iso-level 3 \ + -full-iso9660-filenames \ + -volid "$DISC_NAME" \ + -output "$2" \ + -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \ + -eltorito-boot \ + isolinux/isolinux.bin \ + -no-emul-boot \ + -boot-load-size 4 \ + -boot-info-table \ + --eltorito-catalog isolinux/isolinux.cat \ + "$IMAGE" +# -eltorito-alt-boot \ +# -e /EFI/boot/efiboot.img \ +# -no-emul-boot \ +# -isohybrid-gpt-basdat \ +# -append_partition 2 0xef EFI/boot/efiboot.img \ +# "$IMAGE" \ No newline at end of file diff --git a/path/wdvn-make b/path/wdvn-make new file mode 100755 index 0000000..1b9824f --- /dev/null +++ b/path/wdvn-make @@ -0,0 +1,12 @@ +#!/bin/bash +set -e +mkdir -p "$1" +wdvn-get "$1" +for WDVN_MODLIST in "${@:2}" +do + while IFS="" read -r WDVN_LINE || [ -n "$WDVN_LINE" ] + do + source wdvn-mod "mods/$WDVN_LINE" "$1" + done < "modlists/$WDVN_MODLIST" +done +wdvn-clean "$1" \ No newline at end of file diff --git a/path/wdvn-mod b/path/wdvn-mod new file mode 100755 index 0000000..e39bc34 --- /dev/null +++ b/path/wdvn-mod @@ -0,0 +1,14 @@ +#!/bin/bash +set -e +if [ -f "$1/modscript" ]; then + source "$1/modscript" "$2" +fi + +if [ -d "$1/data" ]; then + cp --reflink=auto -rf "$1/data/." "$2" +fi + +if [ -f "$2/chroot" ]; then + wdvn-chroot "$2" "/chroot" + rm "$2/chroot" +fi \ No newline at end of file diff --git a/path/wdvn-test b/path/wdvn-test new file mode 100755 index 0000000..5b2d2ed --- /dev/null +++ b/path/wdvn-test @@ -0,0 +1,2 @@ +#!/bin/bash +exit \ No newline at end of file diff --git a/shell b/shell index 39c1bb9..bb952f2 100644 --- a/shell +++ b/shell @@ -1,25 +1,11 @@ #!/bin/bash -set -e -alias cp="cp --reflink=auto" -export OPUS_NAME="opus-dvn" -export OPUS_HOME="$(dirname "$(realpath -s "$BASH_SOURCE")")" -export PATH="$OPUS_HOME/path:$PATH" -export OPUS_PID="$BASHPID" -export OPUS_OUTPUT="$OPUS_HOME/chroots" -export OPUS_URL="http://deb.devuan.org/merged" -export OPUS_DIST="chimaera" -export OPUS_SOURCES="deb http://deb.devuan.org/merged $OPUS_DIST main -# deb-src http://deb.devuan.org/merged $OPUS_DIST main +export WDVN_NAME="windvn" +export WDVN_URL="http://deb.devuan.org/merged" +export WDVN_VER="chimaera" +export WDVN_ARCH="i386" +export WDVN_KERNEL="linux-image-686" -deb http://pkgmaster.devuan.org/merged $OPUS_DIST-security main -# deb-src http://pkgmaster.devuan.org/merged $OPUS_DIST-security main - -# chimaera-updates, to get updates before a point release is made; -# see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates> -# deb http://deb.devuan.org/merged $OPUS_DIST-updates main -# deb-src http://deb.devuan.org/merged $OPUS_DIST-updates main -" -export PS1="\[\033[0;35m\]\$OPUS_NAME \$OPUS_ARCH \[\033[0m\]- \[\033[0;37m\]\$PWD\[\033[0m\]: " -env -echo "" -echo "Environment expanded." \ No newline at end of file +export WDVN_DATE="$(date "+%Y.%m.%d-%H.%M.%S")" +export WDVN_PID="$BASHPID" +export PATH="$(dirname "$(realpath -s "$BASH_SOURCE")")/path:$PATH" +export PS1="\[\033[0;35m\]\$WDVN_NAME-\${WDVN_ARCH}_\${WDVN_VER}_\$WDVN_DATE\[\033[0m\]:\[\033[0;37m\]\$(basename -- \$PWD)\[\033[0m\]> " \ No newline at end of file