From e0533bc6d52d957ea69de6fa8e53c1370957957e Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 31 Oct 2023 12:23:14 -0100 Subject: [PATCH] =?UTF-8?q?atualiza=C3=A7ao=20menor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/skel/.config/Thunar/uca.xml | 60 +++++++++++++--------------- my-distro-debian-32-pae/BldHelper.sh | 8 ++-- my-distro-debian-32/BldHelper.sh | 8 ++-- my-distro-debian-64/BldHelper.sh | 8 ++-- my-distro-devuan-32-pae/BldHelper.sh | 8 ++-- my-distro-devuan-32-pae/build.sh | 16 +------- my-distro-devuan-32/BldHelper.sh | 8 ++-- my-distro-devuan-32/build.sh | 14 +------ my-distro-devuan-64/BldHelper.sh | 8 ++-- my-distro-devuan-64/build.sh | 14 +------ 10 files changed, 58 insertions(+), 94 deletions(-) diff --git a/configs/skel/.config/Thunar/uca.xml b/configs/skel/.config/Thunar/uca.xml index 7a7405d3..e5fb8905 100644 --- a/configs/skel/.config/Thunar/uca.xml +++ b/configs/skel/.config/Thunar/uca.xml @@ -2,62 +2,58 @@ utilities-terminal - Abrir terminal aqui + Open terminal here + 1615372407408747-1 exo-open --working-directory %f --launch TerminalEmulator - Exemplo de uma ação personalizada + Example of a custom action + * org.xfce.thunar - Abrir como root + Open as root + 1616353956436746-1 - pkexec thunar - Abrir como root + pkexec thunar %f + Open as root + * preferences-system-search - Procurar por ficheiros + Search for files + 1616359736871731-4 catfish --path=%f - localizar arquivos e pastas + Find files and folders + * - edit-delete - Remover como root - 1616360545203289-6 - xterm -g 35x5 -fa 'Luxi Mono' -fs 14 -e sudo rm -rf %F - Remover arquivos e pastas + accessories-text-editor + Edit as root + + 1687651355823916-1 + pkexec mousepad %f + Edit as root + * * - - - - - - application-x-iso - Montar ficheiros de imagem - 1616360728478102-7 - fuseiso -n -p %f %f.mount ; thunar %f.mount - Montar ficheiros de imagem + application-vnd.oasis.opendocument.text-template + Open in Terminal + + 1687651793865147-4 + xfce4-terminal -x nano %f + Open in Terminal + * * - - - - application-x-iso - Desmontar Imagem - 1616361698703082-8 - fusermount -u -z %f - Desmontar Imagem - * - + diff --git a/my-distro-debian-32-pae/BldHelper.sh b/my-distro-debian-32-pae/BldHelper.sh index e528b1b2..08cbd149 100755 --- a/my-distro-debian-32-pae/BldHelper.sh +++ b/my-distro-debian-32-pae/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-debian SUFFIX=i386-pae BUILD=deb-32-pae FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-debian-32-pae +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-DI-configs/my-distro-debian-32-pae # Execute the ISO building script cd ${WorkingDir} @@ -45,6 +45,6 @@ fi # Clean the build folder lb clean -# Remove the "fusato" directory and its contents +# Remove the "build" directory and its contents cd .. rm -rf build diff --git a/my-distro-debian-32/BldHelper.sh b/my-distro-debian-32/BldHelper.sh index fc0d91dc..d17f5ada 100755 --- a/my-distro-debian-32/BldHelper.sh +++ b/my-distro-debian-32/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-debian SUFFIX=i386 BUILD=deb-32 FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-debian-32 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-DI-configs/my-distro-debian-32 # Execute the ISO building script cd ${WorkingDir} @@ -45,7 +45,7 @@ fi # Clean the build folder lb clean -# Remove the "fusato" directory and its contents +# Remove the "build" directory and its contents cd .. rm -rf build diff --git a/my-distro-debian-64/BldHelper.sh b/my-distro-debian-64/BldHelper.sh index dcb1aff9..3e3e5cd9 100755 --- a/my-distro-debian-64/BldHelper.sh +++ b/my-distro-debian-64/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-debian SUFFIX=amd65 BUILD=deb-64 FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-debian-64 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-DI-configs/my-distro-debian-64 # Execute the ISO building script cd ${WorkingDir} @@ -45,7 +45,7 @@ fi # Clean the build folder lb clean -# Remove the "fusato" directory and its contents +# Remove the "build" directory and its contents cd .. rm -rf build diff --git a/my-distro-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh index f82dc953..f962e3a5 100755 --- a/my-distro-devuan-32-pae/BldHelper.sh +++ b/my-distro-devuan-32-pae/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-devuan SUFFIX=i386-pae BUILD=dev-32-pae FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-devuan-32-pae +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-DI-configs/my-distro-devuan-32-pae # Execute the ISO building script cd ${WorkingDir} @@ -45,7 +45,7 @@ fi # Clean the build folder lb clean -# Remove the "fusato" directory and its contents +# Remove the "build" directory and its contents cd .. rm -rf build diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 42caa5e4..e851802a 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -255,6 +255,7 @@ mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d @@ -265,8 +266,6 @@ cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default -cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d -cp $build/deb-installer/preseed/* $build/build/config/includes.installer cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary @@ -279,19 +278,8 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes cp -r $build/packages/* $build/build/config/packages.chroot -cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub -cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share -cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share - -# Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build/build/config/includes.chroot/usr/share/distro-info -mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates +cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build/build/config/includes.chroot/usr/share/distro-info/my-distro.csv - - # build the ISO # lb build #--debug --verbose diff --git a/my-distro-devuan-32/BldHelper.sh b/my-distro-devuan-32/BldHelper.sh index 88e27412..85f0c48c 100755 --- a/my-distro-devuan-32/BldHelper.sh +++ b/my-distro-devuan-32/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-devuan SUFFIX=i386 BUILD=dev-32 FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-devuan-32 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-DI-configs/my-distro-devuan-32 # Execute the ISO building script cd ${WorkingDir} @@ -45,6 +45,6 @@ fi # Clean the build folder lb clean -# Remove the "fusato" directory and its contents +# Remove the "build" directory and its contents cd .. rm -rf build diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 022aee55..c2638683 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -256,6 +256,7 @@ mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d @@ -266,8 +267,6 @@ cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default -cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d -cp $build/deb-installer/preseed/* $build/build/config/includes.installer cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary @@ -280,17 +279,8 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes cp -r $build/packages/* $build/build/config/packages.chroot -cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub -cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share -cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share - -# Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build/build/config/includes.chroot/usr/share/distro-info -mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates +cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build/build/config/includes.chroot/usr/share/distro-info/my-distro.csv # build the ISO # lb build #--debug --verbose diff --git a/my-distro-devuan-64/BldHelper.sh b/my-distro-devuan-64/BldHelper.sh index 4ce84f07..225df201 100755 --- a/my-distro-devuan-64/BldHelper.sh +++ b/my-distro-devuan-64/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-devuan SUFFIX=amd64 BUILD=dev-64 FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro-di/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-DI-configs/my-distro-devuan-64 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-DI-configs/my-distro-devuan-64 # Execute the ISO building script cd ${WorkingDir} @@ -45,6 +45,6 @@ fi # Clean the build folder lb clean -# Remove the "fusato" directory and its contents +# Remove the "build" directory and its contents cd .. rm -rf build diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index a0ddce6f..11335a98 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -256,6 +256,7 @@ mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d mkdir -p $build/build/config/includes.installer//usr/share +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d @@ -266,8 +267,6 @@ cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default -cp $build/deb-installer/scripts/* $build/build/config/includes.installer/usr/lib/finish-install.d -cp $build/deb-installer/preseed/* $build/build/config/includes.installer cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary @@ -280,17 +279,8 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes cp -r $build/packages/* $build/build/config/packages.chroot -cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub -cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share -cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share - -# Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build/build/config/includes.chroot/usr/share/distro-info -mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates +cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build/build/config/includes.chroot/usr/share/distro-info/my-distro.csv # Build the ISO # lb build #--debug --verbose