Installer
/
melawy-archiso-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

This commit is contained in:
Valeria Fadeeva 2024-01-04 17:55:32 +05:00
parent 3351929ca1
commit 724beba20b
40 changed files with 236 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Melawy-Linux-Full/airootfs/etc/dracut.conf.d/amdgpu.conf Normal file
View File

@ -0,0 +1 @@
force_drivers+=" amdgpu "

1
Melawy-Linux-Full/airootfs/etc/dracut.conf.d/resume-from-hibernate.conf
View File

@ -1 +0,0 @@
add_dracutmodules+=" resume "

22
Melawy-Linux-Full/airootfs/etc/locale.conf
View File

@ -1,13 +1,15 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
LANG=ru_RU.UTF-8
LC_ADDRESS=ru_RU.UTF-8
LC_IDENTIFICATION=ru_RU.UTF-8
LC_MEASUREMENT=ru_RU.UTF-8
LC_MONETARY=ru_RU.UTF-8
LC_NAME=ru_RU.UTF-8
LC_NUMERIC=ru_RU.UTF-8
LC_PAPER=ru_RU.UTF-8
LC_TELEPHONE=ru_RU.UTF-8
LC_TIME=ru_RU.UTF-8
LANG=C.UTF-8
# LANG=ru_RU.UTF-8
# LC_ADDRESS=ru_RU.UTF-8
# LC_IDENTIFICATION=ru_RU.UTF-8
# LC_MEASUREMENT=ru_RU.UTF-8
# LC_MONETARY=ru_RU.UTF-8
# LC_NAME=ru_RU.UTF-8
# LC_NUMERIC=ru_RU.UTF-8
# LC_PAPER=ru_RU.UTF-8
# LC_TELEPHONE=ru_RU.UTF-8
# LC_TIME=ru_RU.UTF-8

2
Melawy-Linux-Full/generate_packages.x86_64_from_netinstall.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

2
Melawy-Linux-Full/generate_packages.x86_64_from_netinstall_min.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

2
Melawy-Linux-Full/generate_packages.x86_64_from_netinstall_tiny.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

9
Melawy-Linux-Full/netinstall.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-Full/netinstall_min.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-Full/netinstall_netinstall.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-Full/netinstall_tiny.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

2
Melawy-Linux-Full/profiledef.sh
View File

@ -25,7 +25,7 @@ file_permissions=(
["/etc/sudoers.d"]="0:0:750"
["/etc/sudoers.d/g_wheel"]="0:0:440"
["/root"]="0:0:750"
["/root/.automated_script"]="0:0:755"
["/root/.automated_script.sh"]="0:0:755"
["/usr/bin/GPU-Intel-installer"]="0:0:755"
["/usr/local/bin/Installation_guide"]="0:0:755"
["/usr/local/bin/calamares-offline"]="0:0:755"

1
Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/amdgpu.conf Normal file
View File

@ -0,0 +1 @@
force_drivers+=" amdgpu "

1
Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/resume-from-hibernate.conf
View File

@ -1 +0,0 @@
add_dracutmodules+=" resume "

22
Melawy-Linux-NetInstall/airootfs/etc/locale.conf
View File

@ -1,13 +1,15 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
LANG=ru_RU.UTF-8
LC_ADDRESS=ru_RU.UTF-8
LC_IDENTIFICATION=ru_RU.UTF-8
LC_MEASUREMENT=ru_RU.UTF-8
LC_MONETARY=ru_RU.UTF-8
LC_NAME=ru_RU.UTF-8
LC_NUMERIC=ru_RU.UTF-8
LC_PAPER=ru_RU.UTF-8
LC_TELEPHONE=ru_RU.UTF-8
LC_TIME=ru_RU.UTF-8
LANG=C.UTF-8
# LANG=ru_RU.UTF-8
# LC_ADDRESS=ru_RU.UTF-8
# LC_IDENTIFICATION=ru_RU.UTF-8
# LC_MEASUREMENT=ru_RU.UTF-8
# LC_MONETARY=ru_RU.UTF-8
# LC_NAME=ru_RU.UTF-8
# LC_NUMERIC=ru_RU.UTF-8
# LC_PAPER=ru_RU.UTF-8
# LC_TELEPHONE=ru_RU.UTF-8
# LC_TIME=ru_RU.UTF-8

34
Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist
View File

@ -3,28 +3,28 @@
################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2023-12-23 11:39:24 UTC
# When: 2024-01-01 19:26:36 UTC
# From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2023-12-23 11:38:53 UTC
# Last Check: 2023-12-23 11:12:26 UTC
# Retrieved: 2024-01-01 19:26:00 UTC
# Last Check: 2024-01-01 19:23:51 UTC
Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch
Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = https://archlinux.thaller.ws/$repo/os/$arch
Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = http://archlinux.thaller.ws/$repo/os/$arch
Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = https://de.arch.mirror.kescher.at/$repo/os/$arch
Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch
Server = http://mirror.moson.org/arch/$repo/os/$arch
Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
Server = rsync://pkg.adfinis.com/archlinux/$repo/os/$arch
Server = rsync://mirror.ubrco.de/archlinux/$repo/os/$arch
Server = rsync://rsync.mirrors.niyawe.de/archlinux/$repo/os/$arch
Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch
Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch
Server = rsync://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch
Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch

2
Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

2
Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall_min.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

2
Melawy-Linux-NetInstall/generate_packages.x86_64_from_netinstall_tiny.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

9
Melawy-Linux-NetInstall/netinstall.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-NetInstall/netinstall_min.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-NetInstall/netinstall_netinstall.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-NetInstall/netinstall_tiny.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

1
Melawy-Linux-NetInstall/packages.x86_64
View File

@ -53,7 +53,6 @@ melawy-plasma-plasmoid-win7showdesktop
melawy-arch-linux-updater
melawy-plasma-plasmoid-archupdate
melawy-calamares-qt6-3.3.1
melawy-skel-root
melawy-skel-liveuser

1
Melawy-Linux-NetInstall/packages.x86_64_
View File

@ -53,7 +53,6 @@ melawy-plasma-plasmoid-win7showdesktop
melawy-arch-linux-updater
melawy-plasma-plasmoid-archupdate
melawy-calamares-qt6-3.3.1
melawy-skel-root
melawy-skel-liveuser

1
Melawy-Linux-NetInstall/packages.x86_64_melawy
View File

@ -53,7 +53,6 @@ melawy-plasma-plasmoid-win7showdesktop
melawy-arch-linux-updater
melawy-plasma-plasmoid-archupdate
melawy-calamares-qt6-3.3.1
melawy-skel-root
melawy-skel-liveuser

2
Melawy-Linux-NetInstall/profiledef.sh
View File

@ -25,7 +25,7 @@ file_permissions=(
["/etc/sudoers.d"]="0:0:750"
["/etc/sudoers.d/g_wheel"]="0:0:440"
["/root"]="0:0:750"
["/root/.automated_script"]="0:0:755"
["/root/.automated_script.sh"]="0:0:755"
["/usr/bin/GPU-Intel-installer"]="0:0:755"
["/usr/local/bin/Installation_guide"]="0:0:755"
["/usr/local/bin/calamares-offline"]="0:0:755"

1
Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/amdgpu.conf Normal file
View File

@ -0,0 +1 @@
force_drivers+=" amdgpu "

1
Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/resume-from-hibernate.conf
View File

@ -1 +0,0 @@
add_dracutmodules+=" resume "

22
Melawy-Linux-Tiny/airootfs/etc/locale.conf
View File

@ -1,13 +1,15 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
LANG=ru_RU.UTF-8
LC_ADDRESS=ru_RU.UTF-8
LC_IDENTIFICATION=ru_RU.UTF-8
LC_MEASUREMENT=ru_RU.UTF-8
LC_MONETARY=ru_RU.UTF-8
LC_NAME=ru_RU.UTF-8
LC_NUMERIC=ru_RU.UTF-8
LC_PAPER=ru_RU.UTF-8
LC_TELEPHONE=ru_RU.UTF-8
LC_TIME=ru_RU.UTF-8
LANG=C.UTF-8
# LANG=ru_RU.UTF-8
# LC_ADDRESS=ru_RU.UTF-8
# LC_IDENTIFICATION=ru_RU.UTF-8
# LC_MEASUREMENT=ru_RU.UTF-8
# LC_MONETARY=ru_RU.UTF-8
# LC_NAME=ru_RU.UTF-8
# LC_NUMERIC=ru_RU.UTF-8
# LC_PAPER=ru_RU.UTF-8
# LC_TELEPHONE=ru_RU.UTF-8
# LC_TIME=ru_RU.UTF-8

2
Melawy-Linux-Tiny/generate_packages.x86_64_from_netinstall.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

2
Melawy-Linux-Tiny/generate_packages.x86_64_from_netinstall_min.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

2
Melawy-Linux-Tiny/generate_packages.x86_64_from_netinstall_tiny.py
View File

@ -179,7 +179,7 @@ ddrescue
edk2-shell
gpart
rsync
melawy-calamares-qt6-3.3.1
melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser
memtest86+
memtest86+-efi

9
Melawy-Linux-Tiny/netinstall.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-Tiny/netinstall_min.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-Tiny/netinstall_netinstall.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

9
Melawy-Linux-Tiny/netinstall_tiny.yaml
View File

@ -733,8 +733,6 @@
- ffmpeg-obs
- audacious
- elisa
# - haruna
# - mpv
- name: "Picture editors (minimal) (full)"
description: "Add the photo and picture editors"
@ -1143,6 +1141,13 @@
- micro
- xterm
- name: "Media players"
description: "Add the audio players"
selected: false
packages:
- haruna
- mpv
- name: "Package management (manual choice)"
description: "Packages tools"
selected: false

2
Melawy-Linux-Tiny/profiledef.sh
View File

@ -25,7 +25,7 @@ file_permissions=(
["/etc/sudoers.d"]="0:0:750"
["/etc/sudoers.d/g_wheel"]="0:0:440"
["/root"]="0:0:750"
["/root/.automated_script"]="0:0:755"
["/root/.automated_script.sh"]="0:0:755"
["/usr/bin/GPU-Intel-installer"]="0:0:755"
["/usr/local/bin/Installation_guide"]="0:0:755"
["/usr/local/bin/calamares-offline"]="0:0:755"

5
clear.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
sudo rm -vrf ./work_*
echo "Ready"

85
make.sh Executable file → Normal file
View File

@ -1,5 +1,11 @@
#!/bin/bash
echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt
CWD=$(cat pwd.txt)
user=$(who | grep "tty" | cut -d" " -f1)
group=$user
if [[ "$UID" != 0 ]]; then
echo "USER NOT ROOT"
sudo "$0"
@ -24,7 +30,7 @@ function clean() {
echo "CLEAN"
if [ -n "$dir" ]; then
cd $dir
cd "$CWD/$dir"
echo "PWD: $(pwd)"
else
exit
@ -34,8 +40,8 @@ function clean() {
rm -v airootfs/root/packages/*.pkg.tar.*
rm -v airootfs/usr/share/packages/*.pkg.tar.*
cd "$(dirname $0)"
echo "PWD: $(dirname $0)"
cd "$CWD"
echo "PWD: $CWD"
}
function mirrorlist() {
@ -54,7 +60,7 @@ function prepare() {
check_internet
if [ -n "$dir" ]; then
cd $dir
cd "$CWD/$dir"
echo "PWD: $(pwd)"
else
exit
@ -84,20 +90,26 @@ function prepare() {
xf86-video-intel
)
pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/usr/share/packages" ${packs[@]}
if [ "$?" -ne 0 ]; then
pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/usr/share/packages" ${packs[@]}
if [ "$?" -ne 0 ]; then
for pack in ${packs[@]}
do
pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/usr/share/packages" $pack
done
fi
fi
paccache -rvk 1 --cachedir "./airootfs/opt/extra-drivers"
paccache -rvk 1 --cachedir "./airootfs/usr/share/packages"
chown -R 1000:1000 ./airootfs/opt/extra-drivers/
chown -R 1000:1000 ./airootfs/usr/share/packages/
chown -R 1000:1000 ../boot/iso
chown -R $user:$group ./airootfs/opt/extra-drivers/
chown -R $user:$group ./airootfs/usr/share/packages/
chown -R $user:$group $CWD/boot/iso
cd "$(dirname $0)"
echo "PWD: $(dirname $0)"
cd "$CWD"
echo "PWD: $CWD"
}
@ -107,32 +119,42 @@ function build() {
check_internet
if [ -n "$dir" ]; then
cd $dir
cd "$CWD/$dir"
echo "PWD: $(pwd)"
else
exit
fi
rm -rfv "../work_${edition}"
mkdir -pv "../boot/"{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null
mkdir -pv "../sf" 2>/dev/null
mkdir -pv "../work_${edition}" 2>/dev/null
mkdir -pv "../sf/${iso_dir}" 2>/dev/null
rm -rfv "$CWD/work_${edition}"
mkdir -pv "$CWD/boot/"{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null
mkdir -pv "$CWD/sf" 2>/dev/null
mkdir -pv "$CWD/work_${edition}" 2>/dev/null
mkdir -pv "$CWD/sf/${iso_dir}" 2>/dev/null
cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/"
if [ -f "../sf/${iso_dir}/${iso_name}.iso" ]; then
rm "../sf/${iso_dir}/${iso_name}.iso"
if [ -f "$CWD/sf/${iso_dir}/${iso_name}.iso" ]; then
rm "$CWD/sf/${iso_dir}/${iso_name}.iso"
fi
pacman -Sw --config pacman_sys.conf --noconfirm $(grep -v '^#' ./packages.x86_64 | grep -v '^$')
if [ "$?" -ne 0 ]; then
pacman -Sw --config pacman_sys.conf --noconfirm $(grep -v '^#' ./packages.x86_64 | grep -v '^$')
fi
./mkarchiso_last_my -v "."
cd "$(dirname $0)"
echo "PWD: $(dirname $0)"
cd "$CWD"
echo "PWD: $CWD"
}
function sign() {
cd "$CWD"
echo "PWD: $CWD"
if [ -n "$dir" ]; then
cd "sf/${iso_dir}"
chown -R $user:$group "$CWD/sf/"
cd "$CWD/sf/${iso_dir}"
echo "PWD: $(pwd)"
else
exit
@ -141,12 +163,12 @@ function sign() {
if [ -f "${std_iso_name}.iso" ] || [ -f "${iso_name}.iso" ]; then
echo "SIGN, SUM, TORRENT"
cp -v "../../verify.sh" "."
cp -v "$CWD/verify.sh" "."
if [ -f "${iso_name}-pkglist.txt" ]; then
rm "${iso_name}-pkglist.txt";
fi
cp -vf "../../work_${edition}/iso/arch/pkglist.x86_64.txt" "${iso_name}-pkglist.txt"
cp -vf "$CWD/work_${edition}/iso/arch/pkglist.x86_64.txt" "${iso_name}-pkglist.txt"
if [ -f "${std_iso_name}.iso" ]; then
mv "${std_iso_name}.iso" "${iso_name}.iso";
@ -183,6 +205,10 @@ function sign() {
rm "${iso_dir}/${iso_name}.torrent"
fi
if [ -f "${iso_dir}/${iso_name}.iso.torrent" ]; then
rm "${iso_dir}/${iso_name}.iso.torrent"
fi
baselink="https://downloads.sourceforge.net/project/melawy-linux/${iso_dir}"
links=""
@ -201,11 +227,13 @@ function sign() {
buildtorrent --nodate --nocreator --md5sum --show --comment="https://melawy.ru" --announce="udp://fosstorrents.com:6969/announce" --announcelist="udp://fosstorrents.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://opentracker.i2p.rocks:6969/announce,udp://open.demonii.com:1337/announce,udp://tracker.openbittorrent.com:6969/announce,http://tracker.openbittorrent.com:80/announce,udp://open.stealth.si:80/announce,udp://tracker.torrent.eu.org:451/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker.moeking.me:6969/announce,udp://explodie.org:6969/announce,https://tracker.tamersunion.org:443/announce,udp://uploads.gamecoast.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.bittor.pw:1337/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://movies.zsw.ca:6969/announce,udp://isk.richardsw.club:6969/announce,https://tracker.renfei.net:443/announce,https://tr.burnabyhighstar.com:443/announce,http://fosstorrents.com:6969/announce" "${iso_dir}" "${iso_dir}/${iso_name}.torrent"
chown -R 1000:1000 ../sf
buildtorrent --nodate --nocreator --md5sum --show --comment="https://melawy.ru" --announce="udp://fosstorrents.com:6969/announce" --announcelist="udp://fosstorrents.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://opentracker.i2p.rocks:6969/announce,udp://open.demonii.com:1337/announce,udp://tracker.openbittorrent.com:6969/announce,http://tracker.openbittorrent.com:80/announce,udp://open.stealth.si:80/announce,udp://tracker.torrent.eu.org:451/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker.moeking.me:6969/announce,udp://explodie.org:6969/announce,https://tracker.tamersunion.org:443/announce,udp://uploads.gamecoast.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.bittor.pw:1337/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://movies.zsw.ca:6969/announce,udp://isk.richardsw.club:6969/announce,https://tracker.renfei.net:443/announce,https://tr.burnabyhighstar.com:443/announce,http://fosstorrents.com:6969/announce" "${iso_dir}/${iso_name}.iso" "${iso_dir}/${iso_name}.iso.torrent"
chown -R $user:$group "$CWD/sf"
fi
cd "$(dirname $0)"
echo "PWD: $(dirname $0)"
cd "$CWD"
echo "PWD: $CWD"
}
function std_build() {
@ -235,6 +263,8 @@ _notify() {
# at TTY
echo "==> INFO: $msg" >&2
if command -v notify-send &> /dev/null
then
# notification
local user userid cmd
@ -252,13 +282,14 @@ _notify() {
)
/usr/bin/su $user -c "${cmd[*]}"
done
fi
}
while true; do
cd "$(dirname $0)"
echo "PWD: $(dirname $0)"
cd "$CWD"
echo "PWD: $CWD"
# clear
cat << _EOF_

1
pwd.txt Normal file
View File

@ -0,0 +1 @@
/data/data/melawy-archiso-config