fix file copy an updated package list

This commit is contained in:
manuel 2024-11-01 12:01:30 -01:00
parent c4e74f0733
commit f971a99b64
4 changed files with 105 additions and 17 deletions

View File

@ -93,7 +93,7 @@ build_variant() {
PKGS="$PKGS $XORG_PKGS lightdm lightdm-gtk3-greeter xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox xfce4-pulseaudio-plugin PKGS="$PKGS $XORG_PKGS lightdm lightdm-gtk3-greeter xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 firefox xfce4-pulseaudio-plugin
mousepad mugshot menulibre thunar-archive-plugin thunar-volman xfce4-battery-plugin xfce4-clipman-plugin xfce4-power-manager xfce4-taskmanager xfce4-terminal xfce4-whiskermenu-plugin mousepad mugshot menulibre thunar-archive-plugin thunar-volman xfce4-battery-plugin xfce4-clipman-plugin xfce4-power-manager xfce4-taskmanager xfce4-terminal xfce4-whiskermenu-plugin
xarchiver alsa-utils bluez btop console-setup cups curl dconf-editor dbus-x11 cantarell-fonts liberation-fonts-ttf git wget gnome-disk-utility gparted gvfs samba avahi inxi xarchiver alsa-utils bluez btop console-setup cups curl dconf-editor dbus-x11 cantarell-fonts liberation-fonts-ttf git wget gnome-disk-utility gparted gvfs samba avahi inxi
network-manager-applet ntp python3-pip python3-pipx python3-tkinter python3-Pillow system-config-printer simple-scan smartmontools smbclient spice-vdagent sqlite openssh nano vim-x11 vim" network-manager-applet ntp python3-pipx python3-tkinter python3-requests python3-certifi python3-Pillow system-config-printer simple-scan smartmontools smbclient spice-vdagent sqlite openssh nano vim-x11 vim"
SERVICES="$SERVICES dbus lightdm NetworkManager polkitd bluetoothd cupsd avahi-daemon ntpd smbd nmbd sshd spice-vdagentd" SERVICES="$SERVICES dbus lightdm NetworkManager polkitd bluetoothd cupsd avahi-daemon ntpd smbd nmbd sshd spice-vdagentd"
LIGHTDM_SESSION=xfce LIGHTDM_SESSION=xfce
;; ;;

75
files_copy.sh Executable file
View File

@ -0,0 +1,75 @@
#!/bin/sh
# Script para copiar arquivos para um diretório ROOTFS existente
# Verifica se o usuário é root
if [ "$(id -u)" -ne 0 ]; then
echo "Este script precisa ser executado com permissões de root."
exit 1
fi
# Verifica se o diretório ROOTFS foi passado como argumento
if [ "$#" -ne 1 ]; then
echo "Uso: $0 <caminho_para_ROOTFS>"
exit 1
fi
# Define o diretório ROOTFS a partir do argumento fornecido
ROOTFS="$1"
# Verifica se o diretório ROOTFS existe
if [ ! -d "$ROOTFS" ]; then
echo "Diretório ROOTFS não encontrado: $ROOTFS"
exit 1
fi
# Copiando os arquivos para os diretórios apropriados dentro de ROOTFS
mkdir -p "$ROOTFS/etc"
cp os-release/* "$ROOTFS/etc"
mkdir -p "$ROOTFS/etc/skel"
cp face/* "$ROOTFS/etc/skel"
mkdir -p "$ROOTFS/etc/skel/.config"
cp -r xfce/* "$ROOTFS/etc/skel/.config"
mkdir -p "$ROOTFS/usr/share/backgrounds"
cp -r wallpaper/* "$ROOTFS/usr/share/backgrounds"
mkdir -p "$ROOTFS/usr/share/icons"
cp -r icons/* "$ROOTFS/usr/share/icons"
mkdir -p "$ROOTFS/usr/share/themes"
cp -r theme/* "$ROOTFS/usr/share/themes"
mkdir -p "$ROOTFS/usr/share/polkit-1/actions"
cp polkit/* "$ROOTFS/usr/share/polkit-1/actions"
mkdir -p "$ROOTFS/usr/lib/python3/dist-packages"
cp -r pylibraries/* "$ROOTFS/usr/lib/python3/dist-packages"
mkdir -p "$ROOTFS/etc/skel/.local/share/pmostools"
cp -r pmostools/* "$ROOTFS/etc/skel/.local/share/pmostools"
mkdir -p "$ROOTFS/usr/share/pixmaps"
cp -r PepProPixMaps/* "$ROOTFS/usr/share/pixmaps"
mkdir -p "$ROOTFS/etc/skel/.config/autostart"
cp autostart/* "$ROOTFS/etc/skel/.config/autostart"
mkdir -p "$ROOTFS/usr/share/fonts/pepconf"
cp font/* "$ROOTFS/usr/share/fonts/pepconf"
mkdir -p "$ROOTFS/usr/local/bin"
cp -r PepProTools/* "$ROOTFS/usr/local/bin"
mkdir -p "$ROOTFS/usr/share/applications"
cp application/* "$ROOTFS/usr/share/applications"
mkdir -p "$ROOTFS/etc/lightdm"
cp lightdm/* "$ROOTFS/etc/lightdm"
mkdir -p "$ROOTFS/usr/share/pep-artwork"
cp -r artwork/* "$ROOTFS/usr/share/pep-artwork"
# Mensagem de sucesso
echo "Arquivos copiados com sucesso para $ROOTFS"

View File

@ -69,7 +69,7 @@ usage() {
cat <<-EOH cat <<-EOH
Usage: $PROGNAME [options] Usage: $PROGNAME [options]
Generates a basic live ISO image of Peppermintos. This ISO image can be written Generates a basic live ISO image of Void Linux. This ISO image can be written
to a CD/DVD-ROM or any USB stick. to a CD/DVD-ROM or any USB stick.
To generate a more complete live ISO image, use build-x86-images.sh. To generate a more complete live ISO image, use build-x86-images.sh.
@ -105,7 +105,7 @@ copy_pep_os-release() {
copy_pep_face() { copy_pep_face() {
mkdir -p "$1"/etc/skel mkdir -p "$1"/etc/skel
cp face/* "$1"/etc/skel cp face/* "$1"/etc/skel/.face
} }
copy_pep_settings() { copy_pep_settings() {
@ -134,18 +134,18 @@ copy_pep_polkit() {
} }
copy_pep_pylibraries() { copy_pep_pylibraries() {
mkdir -p "$1"/usr/lib/python3/dist-packages mkdir -p "$1"/usr/lib/python3.12/dist-packages
cp -r pylibraries/* "$1"//usr/lib/python3/dist-packages cp -r pylibraries/* "$1"/usr/lib/python3.12/dist-packages
} }
copy_pep_pmostools() { copy_pep_pmostools() {
mkdir -p "$1"/etc/skel/.local/share/pmostools mkdir -p "$1"/etc/skel/.local/share/pmostools
cp -r pmostools/* "$1"/etc/skel/.local/share/pmostools cp -r pmostools/* "$1"/etc/skel/.local/share/pmostools
} }
copy_pep_PepProPixMaps() { copy_pep_PepProPixMaps() {
mkdir -p "$1"/usr/share/pixmaps mkdir -p "$1"/usr/share/pixmaps
cp -r PepProPixMaps/* "$1"/usr/share/pixmaps cp PepProPixMaps/* "$1"/usr/share/pixmaps
} }
copy_pep_autostart() { copy_pep_autostart() {
@ -153,11 +153,6 @@ copy_pep_autostart() {
cp autostart/* "$1"/etc/skel/.config/autostart cp autostart/* "$1"/etc/skel/.config/autostart
} }
copy_pep_face() {
mkdir -p "$1"/etc/skel
cp face/* "$1"/etc/skel
}
copy_pep_font() { copy_pep_font() {
mkdir -p "$1"/usr/share/fonts/pepconf mkdir -p "$1"/usr/share/fonts/pepconf
cp font/* "$1"/usr/share/fonts/pepconf cp font/* "$1"/usr/share/fonts/pepconf
@ -170,7 +165,7 @@ copy_pep_application() {
copy_pep_PepProTools() { copy_pep_PepProTools() {
mkdir -p "$1"/usr/local/bin mkdir -p "$1"/usr/local/bin
cp -r PepProTools/* "$1"/usr/local/bin cp PepProTools/* "$1"/usr/local/bin
} }
copy_pep_lightdm() { copy_pep_lightdm() {
@ -180,12 +175,12 @@ copy_pep_lightdm() {
copy_pep_aliases() { copy_pep_aliases() {
mkdir -p "$1"/etc/skel mkdir -p "$1"/etc/skel
cp aliases/* "$1"/etc/skel cp aliases/* "$1"/etc/skel/.bash_aliases
} }
copy_pep_artwork() { copy_pep_artwork() {
mkdir -p "$1"/usr/share/pep-artwork mkdir -p "$1"/usr/share/pep-artwork
cp -r artwork/* "$1"/usr/share/pep-artwork cp artwork/* "$1"/usr/share/pep-artwork
} }
copy_void_keys() { copy_void_keys() {
@ -496,6 +491,25 @@ copy_void_keys "$PEPHOSTDIR"
XBPS_ARCH=$BASE_ARCH $XBPS_INSTALL_CMD -r "$ROOTFS" ${XBPS_REPOSITORY} -S XBPS_ARCH=$BASE_ARCH $XBPS_INSTALL_CMD -r "$ROOTFS" ${XBPS_REPOSITORY} -S
XBPS_ARCH=$ARCH $XBPS_INSTALL_CMD -r "$PEPHOSTDIR" ${XBPS_REPOSITORY} -S XBPS_ARCH=$ARCH $XBPS_INSTALL_CMD -r "$PEPHOSTDIR" ${XBPS_REPOSITORY} -S
# Calls to the copy_pep_* functions
copy_pep_os-release "$ROOTFS"
copy_pep_face "$ROOTFS"
copy_pep_settings "$ROOTFS"
copy_pep_backgrounds "$ROOTFS"
copy_pep_icons "$ROOTFS"
copy_pep_themes "$ROOTFS"
copy_pep_polkit "$ROOTFS"
copy_pep_pylibraries "$ROOTFS"
copy_pep_pmostools "$ROOTFS"
copy_pep_PepProPixMaps "$ROOTFS"
copy_pep_autostart "$ROOTFS"
copy_pep_font "$ROOTFS"
copy_pep_application "$ROOTFS"
copy_pep_PepProTools "$ROOTFS"
#copy_pep_lightdm "$ROOTFS"
copy_pep_aliases "$ROOTFS"
copy_pep_artwork "$ROOTFS"
# Get linux version for ISO # Get linux version for ISO
# If linux version option specified use # If linux version option specified use
if [ -n "$LINUX_VERSION" ]; then if [ -n "$LINUX_VERSION" ]; then
@ -562,4 +576,3 @@ generate_iso_image
hsize=$(du -sh "$OUTPUT_FILE"|awk '{print $1}') hsize=$(du -sh "$OUTPUT_FILE"|awk '{print $1}')
info_msg "Created $(readlink -f "$OUTPUT_FILE") ($hsize) successfully." info_msg "Created $(readlink -f "$OUTPUT_FILE") ($hsize) successfully."

View File

@ -141,7 +141,7 @@ run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -
# Later scripts expect the permissions on / to be the canonical 755, # Later scripts expect the permissions on / to be the canonical 755,
# so we set this here. # so we set this here.
chmod 755 "$ROOTFS" chmod 777 "$ROOTFS"
# The binfmt setup and pseudofs mountpoints are needed for the qemu # The binfmt setup and pseudofs mountpoints are needed for the qemu
# support in cases where we are running things that aren't natively # support in cases where we are running things that aren't natively