From 5b92c181531c7562481bca28a3b43fe5e3ff1379 Mon Sep 17 00:00:00 2001 From: crims0n Date: Sun, 27 Jun 2021 17:40:46 +0300 Subject: [PATCH] Update --- linux-live/basesystem/01-core/minimal.list | 1 + .../basesystem/01-core/rootcopy/etc/issue | 19 +-- linux-live/basesystem/01-core/standard.list | 1 + linux-live/buildconfig | 2 +- linux-live/minioslib | 20 +-- linux-live/modules/03-xfce-desktop/install | 119 ++++++++++++------ .../modules/03-xfce-desktop/postinstall | 16 +-- .../etc/skel/.config/xfce4/helpers.rc | 3 - .../skel/.config/xfce4/panel/whiskermenu-1.rc | 80 ------------ .../home/live/.config/xfce4/helpers.rc | 3 - .../live/.config/xfce4/panel/whiskermenu-1.rc | 2 +- .../rootcopy/root/.config/xfce4/helpers.rc | 3 - .../root/.config/xfce4/panel/whiskermenu-1.rc | 80 ------------ linux-live/modules/04-xfce-apps/install | 45 ++++++- linux-live/modules/04-xfce-apps/standard.list | 16 +-- linux-live/modules/05-firefox-esr/install | 41 ++++++ .../unusedmodules/05-onlyoffice/install | 4 +- linux-live/unusedmodules/05-vscode/install | 4 +- linux-live/unusedmodules/06-codium/install | 13 ++ .../unusedmodules/06-codium/postinstall | 3 + 20 files changed, 224 insertions(+), 251 deletions(-) delete mode 100644 linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/helpers.rc delete mode 100644 linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc delete mode 100644 linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/helpers.rc delete mode 100644 linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/helpers.rc delete mode 100644 linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/whiskermenu-1.rc create mode 100644 linux-live/unusedmodules/06-codium/install create mode 100644 linux-live/unusedmodules/06-codium/postinstall diff --git a/linux-live/basesystem/01-core/minimal.list b/linux-live/basesystem/01-core/minimal.list index c584ca0..1ac4b36 100644 --- a/linux-live/basesystem/01-core/minimal.list +++ b/linux-live/basesystem/01-core/minimal.list @@ -40,4 +40,5 @@ usb-modeswitch pm-utils wget gnupg +openssh-server network-manager \ No newline at end of file diff --git a/linux-live/basesystem/01-core/rootcopy/etc/issue b/linux-live/basesystem/01-core/rootcopy/etc/issue index 7eb4851..1a3e901 100644 --- a/linux-live/basesystem/01-core/rootcopy/etc/issue +++ b/linux-live/basesystem/01-core/rootcopy/etc/issue @@ -7,15 +7,16 @@ Thank you for using MiniOS. - Based on Debian GNU/Linux. - - :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: :::::::: - +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+: - +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ - +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++ - +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ - #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# - ### ### ########### ### #### ########### ######## ######## + Based on Debian GNU/Linux. + Powered by Slax. + + :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: ::::::::  + +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+:  + +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+  + +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++  + +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+  + #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+#  + ### ### ########### ### #### ########### ######## ########  : : : Root login name: root : diff --git a/linux-live/basesystem/01-core/standard.list b/linux-live/basesystem/01-core/standard.list index 3510b05..9ac5fc5 100644 --- a/linux-live/basesystem/01-core/standard.list +++ b/linux-live/basesystem/01-core/standard.list @@ -1,5 +1,6 @@ mc bash-completion +ncdu squashfs-tools genisoimage zip diff --git a/linux-live/buildconfig b/linux-live/buildconfig index 946478b..672f7c0 100644 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -4,7 +4,7 @@ DISTRIBUTION_TYPE="debian" # -DISTRIBUTION="bullseye" +DISTRIBUTION="buster" # DISTRIBUTION_ARCH="amd64" diff --git a/linux-live/minioslib b/linux-live/minioslib index 4197f9e..7f9a8fe 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -1048,6 +1048,8 @@ function chroot_configure() { addgroup live adm >>$OUTPUT 2>&1 addgroup live sudo >>$OUTPUT 2>&1 addgroup live audio >>$OUTPUT 2>&1 + addgroup live users >>$OUTPUT 2>&1 + addgroup live live >>$OUTPUT 2>&1 (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /) @@ -1138,15 +1140,15 @@ EOF Thank you for using MiniOS. Based on Debian GNU/Linux. - Powered by Slax. - - :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: :::::::: - +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+: - +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ - +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++ - +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ - #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# - ### ### ########### ### #### ########### ######## ######## + Powered by Slax. + + :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: ::::::::  + +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+:  + +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+  + +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++  + +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+  + #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+#  + ### ### ########### ### #### ########### ######## ########  : : : Root login name: root : diff --git a/linux-live/modules/03-xfce-desktop/install b/linux-live/modules/03-xfce-desktop/install index 01bc326..1230714 100644 --- a/linux-live/modules/03-xfce-desktop/install +++ b/linux-live/modules/03-xfce-desktop/install @@ -9,45 +9,45 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" GTKUI="2" if [ $DISTRIBUTION = "buster" ] && [ $GTKUI = "3" ]; then + #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + $APT_CMD update >>$OUTPUT 2>&1 && #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update >>$OUTPUT 2>&1 && - #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ - gnupg curl >>$OUTPUT 2>&1 - echo "deb http://mxrepo.com/mx/repo/ temp main" >>/etc/apt/sources.list - curl -L https://cyber-x.ru/wp-content/upload/mx19/mx19.gpg | sudo apt-key add - + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + gnupg curl >>$OUTPUT 2>&1 + echo "deb http://mxrepo.com/mx/repo/ temp main" >>/etc/apt/sources.list + curl -L https://cyber-x.ru/wp-content/upload/mx19/mx19.gpg | sudo apt-key add - fi # install $PACKAGE_VARIANTs if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then + #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + $APT_CMD update >>$OUTPUT 2>&1 && #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update >>$OUTPUT 2>&1 && - #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ - $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 fi if [ $DISTRIBUTION = "buster" ] && [ $GTKUI = "3" ]; then - sed -i "s,deb http://mxrepo.com/mx/repo/ temp main,#deb http://mxrepo.com/mx/repo/ temp main,g" /etc/apt/sources.list + sed -i "s,deb http://mxrepo.com/mx/repo/ temp main,#deb http://mxrepo.com/mx/repo/ temp main,g" /etc/apt/sources.list fi if [ $DISTRIBUTION = "bullseye" ]; then - #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ - librsvg2-common >>$OUTPUT 2>&1 + #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + librsvg2-common >>$OUTPUT 2>&1 fi if grep xfce4-whiskermenu-plugin $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then - if [ $DISTRIBUTION = "buster" ]; then - echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/etc/skel/.config/xfce4/panel/whiskermenu-1.rc - echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/root/.config/xfce4/panel/whiskermenu-1.rc - echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/home/live/.config/xfce4/panel/whiskermenu-1.rc - elif [ $DISTRIBUTION = "bullseye" ]; then - echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/etc/skel/.config/xfce4/panel/whiskermenu-1.rc - echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/root/.config/xfce4/panel/whiskermenu-1.rc - echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/home/live/.config/xfce4/panel/whiskermenu-1.rc - fi - cat <>/etc/skel/.config/xfce4/panel/whiskermenu-1.rc + if [ $DISTRIBUTION = "buster" ]; then + echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/etc/skel/.config/xfce4/panel/whiskermenu-1.rc + echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/root/.config/xfce4/panel/whiskermenu-1.rc + echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/home/live/.config/xfce4/panel/whiskermenu-1.rc + elif [ $DISTRIBUTION = "bullseye" ]; then + echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/etc/skel/.config/xfce4/panel/whiskermenu-1.rc + echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/root/.config/xfce4/panel/whiskermenu-1.rc + echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/home/live/.config/xfce4/panel/whiskermenu-1.rc + fi + cat <>/etc/skel/.config/xfce4/panel/whiskermenu-1.rc recent= button-icon=/usr/share/pixmaps/MiniOS-white.svg button-single-row=false @@ -94,7 +94,7 @@ show-command-logout=true command-menueditor=menulibre show-command-menueditor=true command-profile=mugshot -show-command-profile=true +show-command-profile=false search-actions=5 [action0] @@ -129,7 +129,7 @@ regex=true EOF - cat <>/root/.config/xfce4/panel/whiskermenu-1.rc + cat <>/root/.config/xfce4/panel/whiskermenu-1.rc recent= button-icon=/usr/share/pixmaps/MiniOS-white.svg button-single-row=false @@ -176,7 +176,7 @@ show-command-logout=true command-menueditor=menulibre show-command-menueditor=true command-profile=mugshot -show-command-profile=true +show-command-profile=false search-actions=5 [action0] @@ -211,7 +211,7 @@ regex=true EOF - cat <>/home/live/.config/xfce4/panel/whiskermenu-1.rc + cat <>/home/live/.config/xfce4/panel/whiskermenu-1.rc recent= button-icon=/usr/share/pixmaps/MiniOS-white.svg button-single-row=false @@ -258,7 +258,7 @@ show-command-logout=true command-menueditor=menulibre show-command-menueditor=true command-profile=mugshot -show-command-profile=true +show-command-profile=false search-actions=5 [action0] @@ -293,12 +293,12 @@ regex=true EOF - #echo $WHISKERMENU >>/etc/skel/.config/xfce4/panel/whiskermenu-1.rc - #echo $WHISKERMENU >>/root/.config/xfce4/panel/whiskermenu-1.rc - #echo $WHISKERMENU >>/home/live/.config/xfce4/panel/whiskermenu-1.rc + #echo $WHISKERMENU >>/etc/skel/.config/xfce4/panel/whiskermenu-1.rc + #echo $WHISKERMENU >>/root/.config/xfce4/panel/whiskermenu-1.rc + #echo $WHISKERMENU >>/home/live/.config/xfce4/panel/whiskermenu-1.rc else - #read -r -d MINIMAL_PANEL '' </etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + #read -r -d MINIMAL_PANEL '' </etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -389,7 +389,7 @@ cat </etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml EOF -cat </root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + cat </root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -480,7 +480,7 @@ cat </root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml EOF -cat </home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + cat </home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -571,7 +571,48 @@ cat </home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml EOF - #echo $MINIMAL_PANEL >>/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml - #echo $MINIMAL_PANEL >>/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml - #echo $MINIMAL_PANEL >>/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + #echo $MINIMAL_PANEL >>/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + #echo $MINIMAL_PANEL >>/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + #echo $MINIMAL_PANEL >>/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +fi + +if [ $PACKAGE_VARIANT = "minimal" ]; then + cat </etc/skel/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser= + +EOF + cat </home/live/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser= + +EOF + cat </root/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser= + +EOF + +elif [ $PACKAGE_VARIANT = "standard" ]; then + cat </etc/skel/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=Thunar +WebBrowser= + +EOF + cat </home/live/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=Thunar +WebBrowser= + +EOF + cat </root/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=Thunar +WebBrowser= + +EOF fi diff --git a/linux-live/modules/03-xfce-desktop/postinstall b/linux-live/modules/03-xfce-desktop/postinstall index a9334d6..e27114c 100644 --- a/linux-live/modules/03-xfce-desktop/postinstall +++ b/linux-live/modules/03-xfce-desktop/postinstall @@ -4,15 +4,17 @@ # create user directories for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do - mkdir -p /home/live/$dir >>$OUTPUT 2>&1 - mkdir -p /root/$dir >>$OUTPUT 2>&1 + mkdir -p /home/live/$dir >>$OUTPUT 2>&1 + mkdir -p /root/$dir >>$OUTPUT 2>&1 done -#if [ $DISTRIBUTION = "bullseye" ]; then - rm -f /usr/share/backgrounds/xfce/* - ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-verticals.png - ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-teal.jpg -#fi +rm -f /usr/share/backgrounds/xfce/* +ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-verticals.png +ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-teal.jpg + +if [ $PACKAGE_VARIANT = "standard" ]; then + rm -f /usr/share/applications/pavucontrol.desktop +fi rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/helpers.rc b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/helpers.rc deleted file mode 100644 index 121dec8..0000000 --- a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/helpers.rc +++ /dev/null @@ -1,3 +0,0 @@ -TerminalEmulator= -FileManager= -WebBrowser= \ No newline at end of file diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc deleted file mode 100644 index 42f58f7..0000000 --- a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc +++ /dev/null @@ -1,80 +0,0 @@ -favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop -recent= -button-icon=/usr/share/pixmaps/MiniOS-white.svg -button-single-row=false -show-button-title=false -show-button-icon=true -launcher-show-name=true -launcher-show-description=false -launcher-show-tooltip=true -item-icon-size=2 -hover-switch-category=false -category-show-name=true -category-icon-size=1 -load-hierarchy=false -view-as-icons=false -default-category=0 -recent-items-max=10 -favorites-in-recent=true -position-search-alternate=true -position-commands-alternate=false -position-categories-alternate=true -stay-on-focus-out=false -confirm-session-command=true -menu-width=450 -menu-height=500 -menu-opacity=100 -command-settings=xfce4-settings-manager -show-command-settings=false -command-lockscreen=xflock4 -show-command-lockscreen=false -command-switchuser=dm-tool switch-to-greeter -show-command-switchuser=false -command-logoutuser=xfce4-session-logout --logout --fast -show-command-logoutuser=false -command-restart=xfce4-session-logout --reboot --fast -show-command-restart=false -command-shutdown=xfce4-session-logout --halt --fast -show-command-shutdown=false -command-suspend=xfce4-session-logout --suspend -show-command-suspend=false -command-hibernate=xfce4-session-logout --hibernate -show-command-hibernate=false -command-logout=xfce4-session-logout -show-command-logout=true -command-menueditor=menulibre -show-command-menueditor=true -command-profile=mugshot -show-command-profile=true -search-actions=5 - -[action0] -name=Man Pages -pattern=# -command=exo-open --launch TerminalEmulator man %s -regex=false - -[action1] -name=Web Search -pattern=? -command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u -regex=false - -[action2] -name=Wikipedia -pattern=!w -command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u -regex=false - -[action3] -name=Run in Terminal -pattern=! -command=exo-open --launch TerminalEmulator %s -regex=false - -[action4] -name=Open URI -pattern=^(file|http|https):\\/\\/(.*)$ -command=exo-open \\0 -regex=true - diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/helpers.rc b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/helpers.rc deleted file mode 100644 index 121dec8..0000000 --- a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/helpers.rc +++ /dev/null @@ -1,3 +0,0 @@ -TerminalEmulator= -FileManager= -WebBrowser= \ No newline at end of file diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc index 42f58f7..be72781 100644 --- a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc +++ b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc @@ -45,7 +45,7 @@ show-command-logout=true command-menueditor=menulibre show-command-menueditor=true command-profile=mugshot -show-command-profile=true +show-command-profile=false search-actions=5 [action0] diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/helpers.rc b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/helpers.rc deleted file mode 100644 index 121dec8..0000000 --- a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/helpers.rc +++ /dev/null @@ -1,3 +0,0 @@ -TerminalEmulator= -FileManager= -WebBrowser= \ No newline at end of file diff --git a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/whiskermenu-1.rc deleted file mode 100644 index 42f58f7..0000000 --- a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/whiskermenu-1.rc +++ /dev/null @@ -1,80 +0,0 @@ -favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop -recent= -button-icon=/usr/share/pixmaps/MiniOS-white.svg -button-single-row=false -show-button-title=false -show-button-icon=true -launcher-show-name=true -launcher-show-description=false -launcher-show-tooltip=true -item-icon-size=2 -hover-switch-category=false -category-show-name=true -category-icon-size=1 -load-hierarchy=false -view-as-icons=false -default-category=0 -recent-items-max=10 -favorites-in-recent=true -position-search-alternate=true -position-commands-alternate=false -position-categories-alternate=true -stay-on-focus-out=false -confirm-session-command=true -menu-width=450 -menu-height=500 -menu-opacity=100 -command-settings=xfce4-settings-manager -show-command-settings=false -command-lockscreen=xflock4 -show-command-lockscreen=false -command-switchuser=dm-tool switch-to-greeter -show-command-switchuser=false -command-logoutuser=xfce4-session-logout --logout --fast -show-command-logoutuser=false -command-restart=xfce4-session-logout --reboot --fast -show-command-restart=false -command-shutdown=xfce4-session-logout --halt --fast -show-command-shutdown=false -command-suspend=xfce4-session-logout --suspend -show-command-suspend=false -command-hibernate=xfce4-session-logout --hibernate -show-command-hibernate=false -command-logout=xfce4-session-logout -show-command-logout=true -command-menueditor=menulibre -show-command-menueditor=true -command-profile=mugshot -show-command-profile=true -search-actions=5 - -[action0] -name=Man Pages -pattern=# -command=exo-open --launch TerminalEmulator man %s -regex=false - -[action1] -name=Web Search -pattern=? -command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u -regex=false - -[action2] -name=Wikipedia -pattern=!w -command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u -regex=false - -[action3] -name=Run in Terminal -pattern=! -command=exo-open --launch TerminalEmulator %s -regex=false - -[action4] -name=Open URI -pattern=^(file|http|https):\\/\\/(.*)$ -command=exo-open \\0 -regex=true - diff --git a/linux-live/modules/04-xfce-apps/install b/linux-live/modules/04-xfce-apps/install index 4043009..5138d6a 100644 --- a/linux-live/modules/04-xfce-apps/install +++ b/linux-live/modules/04-xfce-apps/install @@ -15,8 +15,43 @@ if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 fi -if [ $PACKAGE_VARIANT = "standard" ]; then - wget -c https://github.com/VSCodium/vscodium/releases/download/1.57.1/codium_1.57.1-1623975230_amd64.deb && - $APT_CMD install $APT_OPTIONS ./codium_1.57.1-1623975230_amd64.deb && - rm -f ./codium_1.57.1-1623975230_amd64.deb -fi +if [ $PACKAGE_VARIANT = "minimal" ]; then + cat </etc/skel/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser=firefox + +EOF + cat </home/live/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser=firefox + +EOF + cat </root/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser=firefox + +EOF + +elif [ $PACKAGE_VARIANT = "standard" ]; then + cat </etc/skel/.config/xfce4/helpers.rc +TerminalEmulator=xfce4-terminal +FileManager=Thunar +WebBrowser=firefox + +EOF + cat </home/live/.config/xfce4/helpers.rc +TerminalEmulator=xfce4-terminal +FileManager=Thunar +WebBrowser=firefox + +EOF + cat </root/.config/xfce4/helpers.rc +TerminalEmulator=xfce4-terminal +FileManager=Thunar +WebBrowser=firefox + +EOF +fi \ No newline at end of file diff --git a/linux-live/modules/04-xfce-apps/standard.list b/linux-live/modules/04-xfce-apps/standard.list index fe6349b..270955e 100644 --- a/linux-live/modules/04-xfce-apps/standard.list +++ b/linux-live/modules/04-xfce-apps/standard.list @@ -8,10 +8,12 @@ xfce4-screenshooter remmina remmina-plugin-rdp remmina-plugin-vnc -remmina-plugin-nx -remmina-plugin-xdmcp -remmina-plugin-www -remmina-plugin-spice -remmina-plugin-exec -remmina-plugin-secret -remmina-plugin-kiosk \ No newline at end of file +#remmina-plugin-nx +#remmina-plugin-xdmcp +#remmina-plugin-www +#remmina-plugin-spice +#remmina-plugin-exec +#remmina-plugin-secret +#remmina-plugin-kiosk +vlc +gparted \ No newline at end of file diff --git a/linux-live/modules/05-firefox-esr/install b/linux-live/modules/05-firefox-esr/install index ebebf42..2fd7bb0 100644 --- a/linux-live/modules/05-firefox-esr/install +++ b/linux-live/modules/05-firefox-esr/install @@ -14,3 +14,44 @@ if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 fi + +if [ $PACKAGE_VARIANT = "minimal" ]; then + cat </etc/skel/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser=firefox + +EOF + cat </home/live/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser=firefox + +EOF + cat </root/.config/xfce4/helpers.rc +TerminalEmulator=xterm +FileManager=pcmanfm +WebBrowser=firefox + +EOF + +elif [ $PACKAGE_VARIANT = "standard" ]; then + cat </etc/skel/.config/xfce4/helpers.rc +TerminalEmulator=xfce4-terminal +FileManager=Thunar +WebBrowser=firefox + +EOF + cat </home/live/.config/xfce4/helpers.rc +TerminalEmulator=xfce4-terminal +FileManager=Thunar +WebBrowser=firefox + +EOF + cat </root/.config/xfce4/helpers.rc +TerminalEmulator=xfce4-terminal +FileManager=Thunar +WebBrowser=firefox + +EOF +fi \ No newline at end of file diff --git a/linux-live/unusedmodules/05-onlyoffice/install b/linux-live/unusedmodules/05-onlyoffice/install index 4829ba5..328ab99 100644 --- a/linux-live/unusedmodules/05-onlyoffice/install +++ b/linux-live/unusedmodules/05-onlyoffice/install @@ -17,10 +17,10 @@ $APT_CMD autoremove $APT_OPTIONS $APT_OPTIONS2 \ software-properties-common >>$OUTPUT 2>&1 # install packages -if [ -f $SCRIPT_DIR/package.list ]; then +if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD update >>$OUTPUT 2>&1 && #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ - $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 fi diff --git a/linux-live/unusedmodules/05-vscode/install b/linux-live/unusedmodules/05-vscode/install index 528092e..a14e189 100644 --- a/linux-live/unusedmodules/05-vscode/install +++ b/linux-live/unusedmodules/05-vscode/install @@ -12,10 +12,10 @@ sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/trusted.gpg.d/packag rm -f packages.microsoft.gpg # install packages -if [ -f $SCRIPT_DIR/package.list ]; then +if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD update >>$OUTPUT 2>&1 && #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ - $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 fi diff --git a/linux-live/unusedmodules/06-codium/install b/linux-live/unusedmodules/06-codium/install new file mode 100644 index 0000000..4e264f3 --- /dev/null +++ b/linux-live/unusedmodules/06-codium/install @@ -0,0 +1,13 @@ +#!/bin/bash + +set -e # exit on error +set -o pipefail # exit on pipeline error +set -u # treat unset variable as error + +SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" + +if [ $PACKAGE_VARIANT = "standard" ]; then + wget -c https://github.com/VSCodium/vscodium/releases/download/1.57.1/codium_1.57.1-1623975230_amd64.deb && + $APT_CMD install $APT_OPTIONS ./codium_1.57.1-1623975230_amd64.deb && + rm -f ./codium_1.57.1-1623975230_amd64.deb +fi diff --git a/linux-live/unusedmodules/06-codium/postinstall b/linux-live/unusedmodules/06-codium/postinstall new file mode 100644 index 0000000..a407c94 --- /dev/null +++ b/linux-live/unusedmodules/06-codium/postinstall @@ -0,0 +1,3 @@ +#!/bin/bash + +rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1