diff --git a/Melawy-Linux-Full/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Full/airootfs/etc/pacman-cache.conf index 40c51fc..ef82300 100644 --- a/Melawy-Linux-Full/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-Full/airootfs/etc/pacman-cache.conf @@ -102,7 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist [cache] SigLevel = Optional -Server = http://10.120.152.1/$repo/$arch +#Server = http://10.120.152.1/$repo/$arch Server = http://192.168.1.250/$repo/$arch Server = https://repo.melawy.ru/$repo/$arch diff --git a/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf deleted file mode 100644 index baa3177..0000000 --- a/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Melawy Linux install medium x86_64 UEFI EFI with (Open-Source Drivers) -sort-key 03 -efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf deleted file mode 100644 index d55c1fb..0000000 --- a/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Melawy Linux install medium x86_64 UEFI EFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) -sort-key 04 -efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Full/mkarchiso_last_my b/Melawy-Linux-Full/mkarchiso_last_my index ff1b2fc..5dfaee2 100755 --- a/Melawy-Linux-Full/mkarchiso_last_my +++ b/Melawy-Linux-Full/mkarchiso_last_my @@ -441,7 +441,6 @@ _make_boot_on_iso9660() { install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}" install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/" - install -m 0644 -- "${pacstrap_dir}/boot/linux-"* "${isofs_dir}/${install_dir}/boot/${arch}/" for ucode_image in "${ucodes[@]}"; do if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then @@ -516,9 +515,7 @@ _make_boot_on_fat() { mmd -i "${efibootimg}" \ "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}" mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \ - "${pacstrap_dir}/boot/initramfs-"*".img" \ - "${pacstrap_dir}/boot/linux-"* \ - "::/${install_dir}/boot/${arch}/" + "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/" for ucode_image in "${ucodes[@]}"; do if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}") @@ -865,7 +862,6 @@ _make_common_bootmode_systemd-boot() { efiboot_files+=("${work_dir}/loader/" "${pacstrap_dir}/boot/vmlinuz-"* "${pacstrap_dir}/boot/initramfs-"*".img" - "${pacstrap_dir}/boot/linux-"* "${_available_ucodes[@]}") efiboot_imgsize="$(du -bcs -- "${efiboot_files[@]}" 2>/dev/null | awk 'END { print $1 }')" # Create a FAT image for the EFI system partition diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf index 40c51fc..ef82300 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf @@ -102,7 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist [cache] SigLevel = Optional -Server = http://10.120.152.1/$repo/$arch +#Server = http://10.120.152.1/$repo/$arch Server = http://192.168.1.250/$repo/$arch Server = https://repo.melawy.ru/$repo/$arch diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist index bf053f4..d56d6dd 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2024-01-07 12:54:57 UTC +# When: 2024-01-08 07:47:52 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2024-01-07 12:54:28 UTC -# Last Check: 2024-01-07 12:50:15 UTC +# Retrieved: 2024-01-08 07:47:24 UTC +# Last Check: 2024-01-08 07:32:49 UTC Server = https://mirror.f4st.host/archlinux/$repo/os/$arch -Server = http://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = http://mirror.f4st.host/archlinux/$repo/os/$arch -Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch Server = https://archlinux.thaller.ws/$repo/os/$arch +Server = https://mirror.pseudoform.org/$repo/os/$arch +Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = http://mirror.sunred.org/archlinux/$repo/os/$arch Server = http://archlinux.thaller.ws/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch -Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch -Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch +Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch +Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch Server = https://archmirror.it/repos/$repo/os/$arch -Server = rsync://mirror.moson.org/arch/$repo/os/$arch Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf deleted file mode 100644 index baa3177..0000000 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Melawy Linux install medium x86_64 UEFI EFI with (Open-Source Drivers) -sort-key 03 -efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf deleted file mode 100644 index d55c1fb..0000000 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Melawy Linux install medium x86_64 UEFI EFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) -sort-key 04 -efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/mkarchiso_last_my b/Melawy-Linux-NetInstall/mkarchiso_last_my index ff1b2fc..5dfaee2 100755 --- a/Melawy-Linux-NetInstall/mkarchiso_last_my +++ b/Melawy-Linux-NetInstall/mkarchiso_last_my @@ -441,7 +441,6 @@ _make_boot_on_iso9660() { install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}" install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/" - install -m 0644 -- "${pacstrap_dir}/boot/linux-"* "${isofs_dir}/${install_dir}/boot/${arch}/" for ucode_image in "${ucodes[@]}"; do if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then @@ -516,9 +515,7 @@ _make_boot_on_fat() { mmd -i "${efibootimg}" \ "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}" mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \ - "${pacstrap_dir}/boot/initramfs-"*".img" \ - "${pacstrap_dir}/boot/linux-"* \ - "::/${install_dir}/boot/${arch}/" + "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/" for ucode_image in "${ucodes[@]}"; do if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}") @@ -865,7 +862,6 @@ _make_common_bootmode_systemd-boot() { efiboot_files+=("${work_dir}/loader/" "${pacstrap_dir}/boot/vmlinuz-"* "${pacstrap_dir}/boot/initramfs-"*".img" - "${pacstrap_dir}/boot/linux-"* "${_available_ucodes[@]}") efiboot_imgsize="$(du -bcs -- "${efiboot_files[@]}" 2>/dev/null | awk 'END { print $1 }')" # Create a FAT image for the EFI system partition diff --git a/Melawy-Linux-Tiny/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Tiny/airootfs/etc/pacman-cache.conf index 40c51fc..ef82300 100644 --- a/Melawy-Linux-Tiny/airootfs/etc/pacman-cache.conf +++ b/Melawy-Linux-Tiny/airootfs/etc/pacman-cache.conf @@ -102,7 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist [cache] SigLevel = Optional -Server = http://10.120.152.1/$repo/$arch +#Server = http://10.120.152.1/$repo/$arch Server = http://192.168.1.250/$repo/$arch Server = https://repo.melawy.ru/$repo/$arch diff --git a/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist index bf053f4..d56d6dd 100644 --- a/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2024-01-07 12:54:57 UTC +# When: 2024-01-08 07:47:52 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2024-01-07 12:54:28 UTC -# Last Check: 2024-01-07 12:50:15 UTC +# Retrieved: 2024-01-08 07:47:24 UTC +# Last Check: 2024-01-08 07:32:49 UTC Server = https://mirror.f4st.host/archlinux/$repo/os/$arch -Server = http://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = http://mirror.f4st.host/archlinux/$repo/os/$arch -Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch Server = https://archlinux.thaller.ws/$repo/os/$arch +Server = https://mirror.pseudoform.org/$repo/os/$arch +Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = http://mirror.sunred.org/archlinux/$repo/os/$arch Server = http://archlinux.thaller.ws/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch -Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch -Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch +Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch +Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch Server = https://archmirror.it/repos/$repo/os/$arch -Server = rsync://mirror.moson.org/arch/$repo/os/$arch Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf deleted file mode 100644 index baa3177..0000000 --- a/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Melawy Linux install medium x86_64 UEFI EFI with (Open-Source Drivers) -sort-key 03 -efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf deleted file mode 100644 index d55c1fb..0000000 --- a/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Melawy Linux install medium x86_64 UEFI EFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) -sort-key 04 -efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Tiny/mkarchiso_last_my b/Melawy-Linux-Tiny/mkarchiso_last_my index ff1b2fc..5dfaee2 100755 --- a/Melawy-Linux-Tiny/mkarchiso_last_my +++ b/Melawy-Linux-Tiny/mkarchiso_last_my @@ -441,7 +441,6 @@ _make_boot_on_iso9660() { install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}" install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/" - install -m 0644 -- "${pacstrap_dir}/boot/linux-"* "${isofs_dir}/${install_dir}/boot/${arch}/" for ucode_image in "${ucodes[@]}"; do if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then @@ -516,9 +515,7 @@ _make_boot_on_fat() { mmd -i "${efibootimg}" \ "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}" mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \ - "${pacstrap_dir}/boot/initramfs-"*".img" \ - "${pacstrap_dir}/boot/linux-"* \ - "::/${install_dir}/boot/${arch}/" + "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/" for ucode_image in "${ucodes[@]}"; do if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}") @@ -865,7 +862,6 @@ _make_common_bootmode_systemd-boot() { efiboot_files+=("${work_dir}/loader/" "${pacstrap_dir}/boot/vmlinuz-"* "${pacstrap_dir}/boot/initramfs-"*".img" - "${pacstrap_dir}/boot/linux-"* "${_available_ucodes[@]}") efiboot_imgsize="$(du -bcs -- "${efiboot_files[@]}" 2>/dev/null | awk 'END { print $1 }')" # Create a FAT image for the EFI system partition diff --git a/make.sh b/make.sh index 1e9c7e3..180be0d 100755 --- a/make.sh +++ b/make.sh @@ -143,10 +143,17 @@ function build() { fi rm -rfv "$CWD/work_${edition}" + mkdir -pv "$CWD/boot/"{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null + chown -R 1000:1000 "$CWD/boot/" + mkdir -pv "$CWD/sf" 2>/dev/null + chown -R 1000:1000 "$CWD/sf" + mkdir -pv "$CWD/work_${edition}" 2>/dev/null + mkdir -pv "$CWD/sf/${iso_dir}" 2>/dev/null + chown -R 1000:1000 "$CWD/sf/${iso_dir}" cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/" diff --git a/pwd.txt b/pwd.txt index 9c49fbd..26ea645 100644 --- a/pwd.txt +++ b/pwd.txt @@ -1 +1 @@ -/data/data/melawy-archiso-config \ No newline at end of file +/data/github/active/Melawy/Melawy-Dev/MELAWY/Installer/melawy-archiso-config \ No newline at end of file diff --git a/rsync.full.sh b/rsync.full.sh index 30e5dd6..2e3e628 100755 --- a/rsync.full.sh +++ b/rsync.full.sh @@ -1,5 +1,7 @@ #!/bin/bash +status=0 + ip1="10.120.152.1" ip2="192.168.1.250" @@ -19,11 +21,12 @@ fi if [[ -n "$ip" ]]; then echo "Sending" - rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*full*") "${ip}:/var/lib/transmission/Downloads/" + rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*full*") "${ip}:/var/www/www/transmission/downloads/" + status=$? for i in $(find "./sf/" -name "*.torrent") do - rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/" + rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/" status=$(( $status + $? )) done fi @@ -31,5 +34,9 @@ fi echo "Ready" if [ "$status" == 0 ]; then sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + + process=$(ps x | grep konsole | grep $0 | awk '{print $1}') + if [ $(( "$process" + 0 )) -ne 0 ]; then + kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + fi fi diff --git a/rsync.netinstall.sh b/rsync.netinstall.sh index 7b66f23..40db082 100755 --- a/rsync.netinstall.sh +++ b/rsync.netinstall.sh @@ -1,5 +1,7 @@ #!/bin/bash +status=0 + ip1="10.120.152.1" ip2="192.168.1.250" @@ -19,11 +21,12 @@ fi if [[ -n "$ip" ]]; then echo "Sending" - rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*netinstall*") "${ip}:/var/lib/transmission/Downloads/" + rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*netinstall*") "${ip}:/var/www/www/transmission/downloads/" + status=$? for i in $(find "./sf/" -name "*.torrent") do - rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/" + rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/" status=$(( $status + $? )) done fi @@ -31,5 +34,9 @@ fi echo "Ready" if [ "$status" == 0 ]; then sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + + process=$(ps x | grep konsole | grep $0 | awk '{print $1}') + if [ $(( "$process" + 0 )) -ne 0 ]; then + kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + fi fi diff --git a/rsync.tiny.sh b/rsync.tiny.sh index 9a94244..e2c3e3f 100755 --- a/rsync.tiny.sh +++ b/rsync.tiny.sh @@ -1,5 +1,7 @@ #!/bin/bash +status=0 + ip1="10.120.152.1" ip2="192.168.1.250" @@ -19,11 +21,12 @@ fi if [[ -n "$ip" ]]; then echo "Sending" - rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*tiny*") "${ip}:/var/lib/transmission/Downloads/" + rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*tiny*") "${ip}:/var/www/www/transmission/downloads/" + status=$? for i in $(find "./sf/" -name "*.torrent") do - rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/" + rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/" status=$(( $status + $? )) done fi @@ -31,5 +34,9 @@ fi echo "Ready" if [ "$status" == 0 ]; then sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + + process=$(ps x | grep konsole | grep $0 | awk '{print $1}') + if [ $(( "$process" + 0 )) -ne 0 ]; then + kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + fi fi diff --git a/rsync_to_home.sh b/rsync_to_home.sh index a49e145..d0e6856 100755 --- a/rsync_to_home.sh +++ b/rsync_to_home.sh @@ -1,5 +1,7 @@ #!/bin/bash +status=0 + ip1="10.120.152.1" ip2="192.168.1.250" @@ -19,12 +21,12 @@ fi if [[ -n "$ip" ]]; then echo "Sending" - rsync -avP --delete-after --progress -e "ssh" "./sf/" "${ip}:/var/lib/transmission/Downloads/" + rsync -avP --delete-after --progress -e "ssh" "./sf/" "${ip}:/var/www/www/transmission/downloads/" status=$? for i in $(find "./sf/" -name "*.torrent") do - rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/" + rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/" status=$(( $status + $? )) done fi @@ -32,5 +34,9 @@ fi echo "Ready" if [ "$status" == 0 ]; then sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + + process=$(ps x | grep konsole | grep $0 | awk '{print $1}') + if [ $(( "$process" + 0 )) -ne 0 ]; then + kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + fi fi