diff --git a/bootloaders/boot/grub/grub.cfg b/bootloaders/boot/grub/grub.cfg index 37dcd573..e3b40030 100644 --- a/bootloaders/boot/grub/grub.cfg +++ b/bootloaders/boot/grub/grub.cfg @@ -1,7 +1,7 @@ source /boot/grub/config.cfg menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" + linux /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}" initrd /live/initrd.img } menuentry "My-distro Live (fail-safe mode)" { diff --git a/bootloaders/isolinux/menu.cfg b/bootloaders/isolinux/menu.cfg index 72845759..7126c2cc 100644 --- a/bootloaders/isolinux/menu.cfg +++ b/bootloaders/isolinux/menu.cfg @@ -4,7 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe 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 00f8d858..c01b0461 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/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-debian-32-pae +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-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 1e1b90b0..efc19831 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/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-debian-32 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-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 8b8f2091..ba9edc65 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/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-debian-64 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-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 d31381b5..f0018053 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/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-devuan-32-pae +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-configs/my-distro-devuan-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-devuan-32-pae/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg index 37dcd573..e3b40030 100644 --- a/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg @@ -1,7 +1,7 @@ source /boot/grub/config.cfg menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" + linux /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}" initrd /live/initrd.img } menuentry "My-distro Live (fail-safe mode)" { diff --git a/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg b/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg index 72845759..7126c2cc 100644 --- a/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg +++ b/my-distro-devuan-32-pae/bootloaders/isolinux/menu.cfg @@ -4,7 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 5c5adae2..5a756664 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -249,6 +249,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub/themes +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 @@ -260,7 +261,6 @@ 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 -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives @@ -273,16 +273,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #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/themes - -# 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/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 86ccc125..c47bd10a 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/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-devuan-32 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-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/bootloaders/boot/grub/grub.cfg b/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg index 37dcd573..e3b40030 100644 --- a/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg +++ b/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg @@ -1,7 +1,7 @@ source /boot/grub/config.cfg menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" + linux /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}" initrd /live/initrd.img } menuentry "My-distro Live (fail-safe mode)" { diff --git a/my-distro-devuan-32/bootloaders/isolinux/menu.cfg b/my-distro-devuan-32/bootloaders/isolinux/menu.cfg index 72845759..7126c2cc 100644 --- a/my-distro-devuan-32/bootloaders/isolinux/menu.cfg +++ b/my-distro-devuan-32/bootloaders/isolinux/menu.cfg @@ -4,7 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 3d248632..6f1aff15 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -250,6 +250,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/boot/grub/themes +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 @@ -273,14 +274,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #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/themes - -# 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/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 96b396ca..d2cbd34e 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/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-devuan-64 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-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/bootloaders/isolinux/menu.cfg b/my-distro-devuan-64/bootloaders/isolinux/menu.cfg index 72845759..988d424e 100644 --- a/my-distro-devuan-64/bootloaders/isolinux/menu.cfg +++ b/my-distro-devuan-64/bootloaders/isolinux/menu.cfg @@ -4,8 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores - + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe kernel /live/vmlinuz diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index 40aae3ee..ca185c01 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -251,7 +251,7 @@ mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates mkdir -p $build/build/config/includes.chroot/boot/grub/themes - +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 @@ -260,6 +260,7 @@ cp $build/hooks/live/* $build/build/config/hooks/live cp $build/hooks/normal/* $build/build/config/hooks/normal 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 -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm @@ -274,14 +275,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes #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/themes - -# 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/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-ubuntu-64/BldHelper.sh b/my-distro-ubuntu-64/BldHelper.sh index 633bc6de..dcaa7577 100755 --- a/my-distro-ubuntu-64/BldHelper.sh +++ b/my-distro-ubuntu-64/BldHelper.sh @@ -13,9 +13,9 @@ PREFIX=My-distro-ubuntu SUFFIX=amd64 BUILD=ubuntu-64 FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/my-distro/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/manuel/My-distro-configs/my-distro-ubuntu-64 +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-configs/my-distro-ubuntu-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-ubuntu-64/bootloaders/boot/grub/grub.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg index 37dcd573..e3b40030 100644 --- a/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg +++ b/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg @@ -1,7 +1,7 @@ source /boot/grub/config.cfg menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" + linux /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}" initrd /live/initrd.img } menuentry "My-distro Live (fail-safe mode)" { diff --git a/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg b/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg index 72845759..7126c2cc 100644 --- a/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg +++ b/my-distro-ubuntu-64/bootloaders/isolinux/menu.cfg @@ -4,7 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe