diff --git a/linux-live/buildconfig b/linux-live/buildconfig index 4419c4a..a1ec538 100644 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -20,10 +20,11 @@ COMP_TYPE="xz" # вариант bootstrap (используется для сборки Ubuntu) DISTRIBUTION_VARIANT="minbase" -# +# if core, then executing scripts will not build modules. # если core, то выполнение скриптов не будет собирать модули. #SYSTEM_TYPE="core" +# system variant, indicates the used list of packages in modules # вариант системы, указывает на используемый список пакетов в модулях PACKAGE_VARIANT="standard" @@ -40,7 +41,7 @@ OUTPUT="/dev/stdout" BUILD_TEST_ISO="1" # удаляет старые файлы iso для данного типа сборки -REMOVE_OLD_ISO="0" +REMOVE_OLD_ISO="1" # if = "1", creates a copy of minios-live in chroot /opt # если ="1", создаёт копию minios-live в chroot /opt @@ -73,7 +74,7 @@ UNION_BUILD_TYPE="overlayfs" SYSTEMNAME="MiniOS" # Не используется? -SYSTEMVER="2021" +#SYSTEMVER="2021" # использование готового файла bootstrap при установке. Если отсутствует, то скачивается и упаковывается. При последующих сборках распаковывается существующий файл bootstrap. USE_BOOTSTRAP="1" @@ -81,8 +82,8 @@ USE_BOOTSTRAP="1" USE_ROOTFS="1" #ROOT_PASSWORD="uG5TYt5sIzHe" -ROOT_PASSWORD="toor" -USER_NAME="live" -USER_PASSWORD="evil" +#ROOT_PASSWORD="toor" +#USER_NAME="live" +#USER_PASSWORD="evil" CMDLINE_PARSER="true" \ No newline at end of file diff --git a/linux-live/initramfs/static/minios-configure b/linux-live/initramfs/static/minios-configure index 3551f8b..9207f50 100755 --- a/linux-live/initramfs/static/minios-configure +++ b/linux-live/initramfs/static/minios-configure @@ -4,6 +4,11 @@ # Author: crims0n. # +exec 19>/var/log/minios/boot.log +BASH_XTRACEFD=19 + +set -x + SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" function help() { @@ -111,8 +116,31 @@ function read_config() { # read_config file.cfg var_name1 var_name2 allow_root_only -CURRENT_USER_NAME=$(id -nu 1000 2>/dev/null) -CURRENT_USER_GROUP=$(id -ng 1000 2>/dev/null) +CURRENT_USER_NAME=$(id -nu 1000) +CURRENT_USER_GROUP=$(id -ng 1000) + +cat </etc/issue + + + \\l + + + + + + Thank you for using MiniOS. + Based on Debian GNU/Linux. + Powered by Slax. + + :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: ::::::::  + +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+:  + +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+  + +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++  + +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+  + #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+#  + ### ### ########### ### #### ########### ######## ########  + +EOF if [ "$SCRIPT_DIR" != "/usr/bin" ]; then if [ -f /cmdline ]; then @@ -138,6 +166,12 @@ fi if [ "$SCRIPT_DIR" != "/usr/bin" ]; then if [ ! -f /etc/$LIVEKITNAME.conf ]; then cp -rT /etc/skel /root + # create root directories + if [ -d /root ]; then + for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do + mkdir -p /root/$dir + done + fi chown 0:0 /root chown -R 0:0 /root fi @@ -244,14 +278,14 @@ if [ ! -f /etc/$LIVEKITNAME.conf ]; then if [ ! -z $USER_NAME ]; then if [ -z $CURRENT_USER_NAME ]; then # create user directories - if [ -d /home/$USER_NAME/$dir ]; then + if [ -d /home/$USER_NAME ]; then for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do mkdir -p /home/$USER_NAME/$dir done - UID=$(id -u $USER_NAME) - GID=$(id -g $USER_NAME) - chown $USER_NAME:$USER_NAME /home/$USER_NAME - chown -R $USER_NAME:$USER_NAME /home/$USER_NAME + USER_ID=$(id -u $USER_NAME) + GROUP_ID=$(id -g $USER_NAME) + chown $USER_ID:$GROUP_ID /home/$USER_NAME + chown -R $USER_ID:$GROUP_ID /home/$USER_NAME fi fi fi @@ -296,26 +330,7 @@ fi if [ "$CLOUD" != "true" ]; then if [ ! -z "$USER_NAME" ]; then if [ "$USER_NAME" != "root" ]; then - cat </etc/issue - - - \l - - - - - - Thank you for using MiniOS. - Based on Debian GNU/Linux. - Powered by Slax. - - :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: ::::::::  - +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+:  - +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+  - +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++  - +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+  - #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+#  - ### ### ########### ### #### ########### ######## ########  + cat <>/etc/issue Root login name: root Password: $ROOT_PASSWORD @@ -328,26 +343,7 @@ if [ "$CLOUD" != "true" ]; then EOF else - cat </etc/issue - - - \l - - - - - - Thank you for using MiniOS. - Based on Debian GNU/Linux. - Powered by Slax. - - :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: ::::::::  - +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+:  - +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+  - +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++  - +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+  - #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+#  - ### ### ########### ### #### ########### ######## ########  + cat <>/etc/issue Root login name: root Password: $ROOT_PASSWORD @@ -362,26 +358,7 @@ EOF fi fi else - cat </etc/issue - - - \l - - - - - - Thank you for using MiniOS. - Based on Debian GNU/Linux. - Powered by Slax. - - :::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: ::::::::  - +:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+:  - +:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+  - +#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++  - +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+  - #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+#  - ### ### ########### ### #### ########### ######## ########  + cat <>/etc/issue User login name set by cloud-init. You must use diff --git a/linux-live/livekitlib b/linux-live/livekitlib index 94590c4..70502d6 100644 --- a/linux-live/livekitlib +++ b/linux-live/livekitlib @@ -833,7 +833,11 @@ minios_configure() { cp /opt/minios-modules.tar.xz $1/minios-modules.tar.xz fi - chroot $1 /bin/bash -c "/minios-configure" >/dev/null 2>&1 + mkdir $1/var/log/minios + chroot $1 /bin/bash -c "/minios-configure" >>/dev/null 2>&1 + : 'chroot $1 /bin/bash <<'EOF' +/minios-configure >>$1/var/log/minios/boot.log 2>&1 +EOF' if [ "$WRITABLE" = "true" ]; then if [ -f $1/etc/$LIVEKITNAME.conf ]; then diff --git a/linux-live/minioslib b/linux-live/minioslib index 68ea9c2..4384697 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -620,7 +620,6 @@ DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE PACKAGE_VARIANT=$PACKAGE_VARIANT COMP_TYPE=$COMP_TYPE KERNEL_ARCH=$KERNEL_ARCH -USER_NAME=$USER_NAME EOF cat <<'EOF' >$1/functions @@ -725,14 +724,23 @@ function create_apt_list() { fi } -function chroot_run() { +function get_vars() { echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." + set +u + add_chroot_configuration_files $1 + . /functions + read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH + export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH + set -u +} +function chroot_run() { + echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." add_chroot_configuration_files $1 chroot $1 /bin/bash <>$OUTPUT 2>&1 - VER=$SYSTEMVER + #VER=$SYSTEMVER DATE=$(date +%Y%m%d_%H%M) DIR=$BUILD_DIR/image @@ -1226,7 +1234,7 @@ function build_iso() { #VER="$SYSTEMNAME $VER" VER="$SYSTEMNAME" - if [ REMOVE_OLD_ISO = "1" ]; then + if [ $REMOVE_OLD_ISO = "1" ]; then rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-*.iso >>$OUTPUT 2>&1 while [ -f $ISO_DIR/$LIVEKITNAME.iso ]; do rm $ISO_DIR/$LIVEKITNAME.iso >>$OUTPUT 2>&1 @@ -1462,67 +1470,24 @@ EOF function main_pkg_list() { echo -e "${YELLOW}=====> installing main packages for chroot system ...${ENDCOLOUR}" + get_vars + $APT_CMD update if [ -f /linux-live/basesystem/01-core/preinstall ]; then chmod +x /linux-live/basesystem/01-core/preinstall - /usr/bin/env \ - OUTPUT=$OUTPUT \ - LOGPATH=$LOGPATH \ - BUILD_TEST_ISO=$BUILD_TEST_ISO \ - CREATE_BACKUP=$CREATE_BACKUP \ - DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \ - APT_CMD=$APT_CMD \ - APT_OPTIONS=$APT_OPTIONS \ - LIVE_TYPE=$LIVE_TYPE \ - DISTRIBUTION=$DISTRIBUTION \ - DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \ - PACKAGE_VARIANT=$PACKAGE_VARIANT \ - COMP_TYPE=$COMP_TYPE \ - KERNEL_ARCH=$KERNEL_ARCH \ - USER_NAME=$USER_NAME \ - /linux-live/basesystem/01-core/preinstall + /linux-live/basesystem/01-core/preinstall fi : ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy-install)" != "" ]; then (cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /) fi' if [ -f /linux-live/basesystem/01-core/install ]; then chmod +x /linux-live/basesystem/01-core/install - /usr/bin/env \ - OUTPUT=$OUTPUT \ - LOGPATH=$LOGPATH \ - BUILD_TEST_ISO=$BUILD_TEST_ISO \ - CREATE_BACKUP=$CREATE_BACKUP \ - DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \ - APT_CMD=$APT_CMD \ - APT_OPTIONS=$APT_OPTIONS \ - LIVE_TYPE=$LIVE_TYPE \ - DISTRIBUTION=$DISTRIBUTION \ - DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \ - PACKAGE_VARIANT=$PACKAGE_VARIANT \ - COMP_TYPE=$COMP_TYPE \ - KERNEL_ARCH=$KERNEL_ARCH \ - USER_NAME=$USER_NAME \ - /linux-live/basesystem/01-core/install + /linux-live/basesystem/01-core/install fi if [ -f /linux-live/basesystem/01-core/postinstall ]; then chmod +x /linux-live/basesystem/01-core/postinstall - /usr/bin/env \ - OUTPUT=$OUTPUT \ - LOGPATH=$LOGPATH \ - BUILD_TEST_ISO=$BUILD_TEST_ISO \ - CREATE_BACKUP=$CREATE_BACKUP \ - DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \ - APT_CMD=$APT_CMD \ - APT_OPTIONS=$APT_OPTIONS \ - LIVE_TYPE=$LIVE_TYPE \ - DISTRIBUTION=$DISTRIBUTION \ - DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE \ - PACKAGE_VARIANT=$PACKAGE_VARIANT \ - COMP_TYPE=$COMP_TYPE \ - KERNEL_ARCH=$KERNEL_ARCH \ - USER_NAME=$USER_NAME \ - /linux-live/basesystem/01-core/postinstall + /linux-live/basesystem/01-core/postinstall fi chroot_cleanup diff --git a/linux-live/modules/02-xorg/install b/linux-live/modules/02-xorg/install index 20585f8..cbe45b9 100644 --- a/linux-live/modules/02-xorg/install +++ b/linux-live/modules/02-xorg/install @@ -22,6 +22,6 @@ ConditionKernelCommandLine=!text After=systemd-user-sessions.service [Service] -ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" $USER_NAME +ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live EOF \ No newline at end of file diff --git a/linux-live/modules/03-xfce-desktop/postinstall b/linux-live/modules/03-xfce-desktop/postinstall index f484a69..45b14e0 100644 --- a/linux-live/modules/03-xfce-desktop/postinstall +++ b/linux-live/modules/03-xfce-desktop/postinstall @@ -14,7 +14,7 @@ if grep slim $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then if [ $PACKAGE_VARIANT = "minimal" ]; then sed -i 's,#default_user simone,default_user root,g' /etc/slim.conf else - sed -i "s,#default_user simone,default_user $USER_NAME,g" /etc/slim.conf + sed -i "s,#default_user simone,default_user live,g" /etc/slim.conf fi sed -i 's,#auto_login no,auto_login yes,g' /etc/slim.conf sed -i 's,current_theme debian-softwaves,current_theme minios,g' /etc/slim.conf diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs new file mode 100644 index 0000000..a6f8a88 --- /dev/null +++ b/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs @@ -0,0 +1,8 @@ +XDG_DESKTOP_DIR="$HOME/Desktop" +XDG_DOCUMENTS_DIR="$HOME/Documents" +XDG_DOWNLOAD_DIR="$HOME/Downloads" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/Pictures" +XDG_PUBLICSHARE_DIR="$HOME/Public" +XDG_TEMPLATES_DIR="$HOME/Templates" +XDG_VIDEOS_DIR="$HOME/Videos" \ No newline at end of file diff --git a/linux-live/modules/03-xfce-desktop/standard.list b/linux-live/modules/03-xfce-desktop/standard.list index 5dacc83..0185a54 100644 --- a/linux-live/modules/03-xfce-desktop/standard.list +++ b/linux-live/modules/03-xfce-desktop/standard.list @@ -22,4 +22,5 @@ pavucontrol xfce4-xkb-plugin xfce4-battery-plugin xfce4-whiskermenu-plugin -network-manager-gnome \ No newline at end of file +network-manager-gnome +xdg-user-dirs \ No newline at end of file diff --git a/linux-live/modules/05-firefox/install b/linux-live/modules/05-firefox/install index 66b469f..f8d7784 100644 --- a/linux-live/modules/05-firefox/install +++ b/linux-live/modules/05-firefox/install @@ -8,11 +8,9 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" # install packages if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then - #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS \ firefox >>$OUTPUT 2>&1 elif [ $DISTRIBUTION_TYPE = "debian" ]; then - #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS \ firefox-esr >>$OUTPUT 2>&1 fi diff --git a/modules/03-cinnamon-desktop/install b/modules/03-cinnamon-desktop/install index 61f720a..5f4b135 100644 --- a/modules/03-cinnamon-desktop/install +++ b/modules/03-cinnamon-desktop/install @@ -30,13 +30,6 @@ if grep slim $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then sed -i 's,current_theme debian-softwaves,current_theme minios,g' /etc/slim.conf fi -# 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 /etc/skel/$dir >>$OUTPUT 2>&1 -done - update-alternatives --install /usr/share/images/desktop-base/desktop-background desktop-background /usr/share/backgrounds/MiniOS-wallpaper.svg 100 cat <>/usr/share/applications/htop.desktop diff --git a/modules/03-xfce-desktop/postinstall b/modules/03-xfce-desktop/postinstall index b72f284..1989b88 100644 --- a/modules/03-xfce-desktop/postinstall +++ b/modules/03-xfce-desktop/postinstall @@ -1,13 +1,5 @@ #!/bin/bash -#(cd /rootcopy && cp --parents -afr * /) - -# 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 -done - 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 diff --git a/modules/05-firefox-esr/install b/modules/05-firefox-esr/install index 2fd7bb0..9a95c2f 100644 --- a/modules/05-firefox-esr/install +++ b/modules/05-firefox-esr/install @@ -8,11 +8,8 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" # install packages 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_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 + $APT_CMD install $APT_OPTIONS firefox-esr >>$OUTPUT 2>&1 fi if [ $PACKAGE_VARIANT = "minimal" ]; then diff --git a/modules/05-firefox-esr/minimal.list b/modules/05-firefox-esr/minimal.list deleted file mode 100644 index e7b065e..0000000 --- a/modules/05-firefox-esr/minimal.list +++ /dev/null @@ -1 +0,0 @@ -firefox-esr \ No newline at end of file diff --git a/modules/05-firefox-esr/standard.list b/modules/05-firefox-esr/standard.list deleted file mode 100644 index e7b065e..0000000 --- a/modules/05-firefox-esr/standard.list +++ /dev/null @@ -1 +0,0 @@ -firefox-esr \ No newline at end of file diff --git a/modules/05-palemoon/install b/modules/05-palemoon/install index 4de2880..87594e8 100644 --- a/modules/05-palemoon/install +++ b/modules/05-palemoon/install @@ -6,8 +6,7 @@ curl -fsSL http://download.opensuse.org/repositories/home:stevenpusser/Debian_10 # install packages if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then $APT_CMD update >>$OUTPUT 2>&1 && - $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 palemoon >>$OUTPUT 2>&1 fi if [ $PACKAGE_VARIANT = "minimal" ]; then @@ -16,12 +15,6 @@ TerminalEmulator=xterm FileManager=pcmanfm WebBrowser=palemoon -EOF - cat </home/live/.config/xfce4/helpers.rc -TerminalEmulator=xterm -FileManager=pcmanfm -WebBrowser=palemoon - EOF cat </root/.config/xfce4/helpers.rc TerminalEmulator=xterm @@ -36,12 +29,6 @@ TerminalEmulator=xfce4-terminal FileManager=Thunar WebBrowser=palemoon -EOF - cat </home/live/.config/xfce4/helpers.rc -TerminalEmulator=xfce4-terminal -FileManager=Thunar -WebBrowser=palemoon - EOF cat </root/.config/xfce4/helpers.rc TerminalEmulator=xfce4-terminal diff --git a/modules/05-palemoon/minimal.list b/modules/05-palemoon/minimal.list deleted file mode 100644 index e4f291d..0000000 --- a/modules/05-palemoon/minimal.list +++ /dev/null @@ -1,2 +0,0 @@ -chromium -chromium-sandbox \ No newline at end of file diff --git a/modules/05-palemoon/standard.list b/modules/05-palemoon/standard.list deleted file mode 100644 index df28f7a..0000000 --- a/modules/05-palemoon/standard.list +++ /dev/null @@ -1 +0,0 @@ -palemoon \ No newline at end of file diff --git a/modules/06-codium/install b/modules/06-codium/install index 112b2dc..330f2c4 100644 --- a/modules/06-codium/install +++ b/modules/06-codium/install @@ -4,8 +4,26 @@ set -e # exit on error set -o pipefail # exit on pipeline error set -u # treat unset variable as error +local VERSION SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -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 +get_latest_release() { + wget -q -O- "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api + grep '"tag_name":' | # Get tag line + sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value +} + +KERNEL_ARCH="amd64" + +get_latest_package_url() { + wget -q -O- "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api + grep '"browser_download_url":' | grep "$KERNEL_ARCH.deb"\" | # Get tag line + sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value +} + +URL=$(get_latest_package VSCodium/vscodium) +PACKAGE=$(ls codium*$KERNEL_ARCH.deb) + +wget -c $URL && + $APT_CMD install $APT_OPTIONS ./$PACKAGE && + rm -f ./$PACKAGE diff --git a/modules/06-codium/postinstall b/modules/06-codium/postinstall index a407c94..de227f1 100644 --- a/modules/06-codium/postinstall +++ b/modules/06-codium/postinstall @@ -1,3 +1,5 @@ #!/bin/bash +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/hicolor/512x512 >>$OUTPUT 2>&1 rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/modules/06-langpack-ru/install b/modules/06-langpack-ru/install index 4d0c715..4d84019 100644 --- a/modules/06-langpack-ru/install +++ b/modules/06-langpack-ru/install @@ -12,13 +12,10 @@ debconf-set-selections preseed.txt # install packages 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_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 + $APT_CMD install $APT_OPTIONS locales >>$OUTPUT 2>&1 fi dpkg-reconfigure locales >>$OUTPUT 2>&1 dpkg-reconfigure keyboard-configuration >>$OUTPUT 2>&1 -dpkg-reconfigure tzdata >>$OUTPUT 2>&1 \ No newline at end of file +dpkg-reconfigure tzdata >>$OUTPUT 2>&1 diff --git a/modules/06-langpack-ru/minimal.list b/modules/06-langpack-ru/minimal.list deleted file mode 100644 index 9a43ff6..0000000 --- a/modules/06-langpack-ru/minimal.list +++ /dev/null @@ -1 +0,0 @@ -locales \ No newline at end of file diff --git a/modules/06-langpack-ru/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml b/modules/06-langpack-ru/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml deleted file mode 100644 index dd94eae..0000000 --- a/modules/06-langpack-ru/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/modules/06-langpack-ru/standard.list b/modules/06-langpack-ru/standard.list deleted file mode 100644 index 9a43ff6..0000000 --- a/modules/06-langpack-ru/standard.list +++ /dev/null @@ -1 +0,0 @@ -locales \ No newline at end of file diff --git a/modules/06-onlyoffice/postinstall b/modules/06-onlyoffice/postinstall index a407c94..de227f1 100644 --- a/modules/06-onlyoffice/postinstall +++ b/modules/06-onlyoffice/postinstall @@ -1,3 +1,5 @@ #!/bin/bash +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/hicolor/512x512 >>$OUTPUT 2>&1 rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/modules/06-virtmanager/install b/modules/06-virtmanager/install index edea612..874a3d6 100644 --- a/modules/06-virtmanager/install +++ b/modules/06-virtmanager/install @@ -4,6 +4,7 @@ set -e # exit on error set -o pipefail # exit on pipeline error set -u # treat unset variable as error +. /etc/minios.conf SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" # install packages @@ -16,4 +17,4 @@ $APT_CMD update >>$OUTPUT 2>&1 && virt-manager \ gir1.2-spiceclientgtk-3.0 >>$OUTPUT 2>&1 -usermod -aG libvirt live +usermod -aG libvirt $USER_NAME diff --git a/modules/06-virtmanager/postinstall b/modules/06-virtmanager/postinstall index 6cc29b5..de227f1 100644 --- a/modules/06-virtmanager/postinstall +++ b/modules/06-virtmanager/postinstall @@ -1,4 +1,5 @@ #!/bin/bash rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/hicolor/512x512 >>$OUTPUT 2>&1 rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/modules/06-virtualbox/install b/modules/06-virtualbox/install index b9f0914..1a79f35 100644 --- a/modules/06-virtualbox/install +++ b/modules/06-virtualbox/install @@ -34,6 +34,6 @@ echo virtualbox-ext-pack virtualbox-ext-pack/license select true | sudo debconf- # install packages $APT_CMD install $APT_OPTIONS virtualbox-6.1 >>$OUTPUT 2>&1 -wget -c https://download.virtualbox.org/virtualbox/6.1.30/Oracle_VM_VirtualBox_Extension_Pack-$VBOX_VERSION.vbox-extpack +wget -c https://download.virtualbox.org/virtualbox/$VBOX_VERSION/Oracle_VM_VirtualBox_Extension_Pack-$VBOX_VERSION.vbox-extpack VBoxManage extpack install --replace $SCRIPT_DIR/Oracle_VM_VirtualBox_Extension_Pack-$VBOX_VERSION.vbox-extpack diff --git a/modules/06-virtualbox/postinstall b/modules/06-virtualbox/postinstall index f44e8eb..d27260e 100644 --- a/modules/06-virtualbox/postinstall +++ b/modules/06-virtualbox/postinstall @@ -28,4 +28,5 @@ $APT_CMD autoremove $APT_OPTIONS \ rm -f $SCRIPT_DIR/Oracle_VM_VirtualBox_Extension_Pack-$VBOX_VERSION.vbox-extpack rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/hicolor/512x512 >>$OUTPUT 2>&1 rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/modules/06-vscode/install b/modules/06-vscode/install index 93d8678..3560e6d 100644 --- a/modules/06-vscode/install +++ b/modules/06-vscode/install @@ -14,6 +14,5 @@ rm -f packages.microsoft.gpg # install packages if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then $APT_CMD update >>$OUTPUT 2>&1 && - $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 code >>$OUTPUT 2>&1 fi diff --git a/modules/06-vscode/minimal.list b/modules/06-vscode/minimal.list deleted file mode 100644 index 0469830..0000000 --- a/modules/06-vscode/minimal.list +++ /dev/null @@ -1 +0,0 @@ -code \ No newline at end of file diff --git a/modules/06-vscode/postinstall b/modules/06-vscode/postinstall index 06707c1..8488983 100644 --- a/modules/06-vscode/postinstall +++ b/modules/06-vscode/postinstall @@ -3,4 +3,6 @@ $APT_CMD autoremove $APT_OPTIONS $APT_OPTIONS2 \ software-properties-common >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/hicolor/512x512 >>$OUTPUT 2>&1 rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/modules/06-vscode/standard.list b/modules/06-vscode/standard.list deleted file mode 100644 index 0469830..0000000 --- a/modules/06-vscode/standard.list +++ /dev/null @@ -1 +0,0 @@ -code \ No newline at end of file