Update
This commit is contained in:
parent
8221653572
commit
7ec6a9ef62
|
@ -11,3 +11,5 @@ mkdir ./{work,out}
|
|||
|
||||
echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
|
||||
notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
|
||||
|
||||
echo "Ready"
|
||||
|
|
|
@ -7,3 +7,5 @@ mkdir ./{work,out}
|
|||
|
||||
echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
|
||||
notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
|
||||
|
||||
echo "Ready"
|
||||
|
|
|
@ -28,3 +28,5 @@ xf86-video-intel
|
|||
|
||||
echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
|
||||
notify-send -a "$(basename $(pwd)): Prepare" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
|
||||
|
||||
echo "Ready"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo chown -R 1000:1000 ./airootfs/opt/extra-drivers/
|
||||
sudo chown -R 1000:1000 ./airootfs/usr/share/packages/
|
||||
sudo chown -R 1000:1000 ./out
|
||||
|
|
|
@ -7,4 +7,4 @@ cp ./work/iso/arch/pkglist.x86_64.txt ./out/Melawy-linux-${rename}-pkglist.txt
|
|||
echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
|
||||
notify-send -a "$(basename $(pwd)): Make" -t 999999999 "Make finished" "$(date '+%Y.%m.%d %H:%M:%S')"
|
||||
|
||||
sudo chown -R 1000:1000 ./out
|
||||
echo "Ready"
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo chown -R 1000:1000 ./out
|
||||
mv ./out/* ../boot/iso/
|
||||
|
||||
echo "Ready"
|
|
@ -1,3 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
git add . && git commit -m "Update" && git push
|
||||
|
||||
echo "Ready"
|
|
@ -0,0 +1,80 @@
|
|||
#!/bin/bash
|
||||
|
||||
__find_esp__() {
|
||||
local parttype
|
||||
local fstype
|
||||
local device
|
||||
|
||||
while read -r device; do
|
||||
read -r parttype fstype ESP <<<"$(lsblk -o "PARTTYPE,FSTYPE,MOUNTPOINT" "$device" 2>/dev/null | awk 'NR==2')"
|
||||
|
||||
[[ "${parttype,,}" != "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" ]] && continue
|
||||
[[ "${fstype,,}" != "vfat" ]] && continue
|
||||
[[ -z $(findmnt -sn "$ESP") ]] && continue
|
||||
|
||||
done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)"
|
||||
|
||||
if [ -z "${ESP}" ]; then
|
||||
ESP=$(grep -i "/efi" /etc/fstab | awk '{print $2}')
|
||||
if [ -z "${ESP}" ]; then
|
||||
ESP=$(grep -i "/boot" /etc/fstab | awk '{print $2}')
|
||||
if [ -z "${ESP}" ]; then
|
||||
ESP=$(bootctl --print-esp-path)
|
||||
if [ -z "${ESP}" ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Found ${ESP}"
|
||||
readonly ESP
|
||||
}
|
||||
|
||||
__has_esp__() {
|
||||
__find_esp__
|
||||
|
||||
mount "$ESP" &>/dev/null
|
||||
[[ -d "$ESP/EFI" ]] && return 0 || return 1
|
||||
}
|
||||
|
||||
|
||||
THEME_NAME="melawy-nier-a2"
|
||||
|
||||
echo "Searching rEFInd installation in EFI partition..."
|
||||
if ! __has_esp__; then
|
||||
echo "EFI partition not found" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
REFIND_DIR=$(find "$ESP" -type d -iname refind)
|
||||
if ! [[ -d "${REFIND_DIR}" ]]; then
|
||||
echo "rEFInd not installed in $ESP" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Found rEFInd in ${REFIND_DIR}"
|
||||
|
||||
echo "Installing themes in ${REFIND_DIR}"
|
||||
|
||||
cp -vrf "/usr/share/refind/themes" "${REFIND_DIR}/"
|
||||
|
||||
REFIND_CONF_PATH="${REFIND_DIR}/refind.conf"
|
||||
|
||||
cp -vf "/etc/refind-menu-generator/refind.conf" "${REFIND_DIR}/refind.conf"
|
||||
|
||||
RESULT=$(grep "theme" "$REFIND_CONF_PATH")
|
||||
|
||||
if [[ "$?" = "0" ]]; then
|
||||
CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2)
|
||||
if [[ "$?" == "0" ]]; then
|
||||
sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i "$REFIND_CONF_PATH"
|
||||
fi
|
||||
else
|
||||
if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then
|
||||
echo "include themes/$THEME_NAME/theme.conf" >> "$REFIND_CONF_PATH"
|
||||
else
|
||||
echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> "$REFIND_CONF_PATH"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "calamares yes" > /etc/refind-menu-generator/install_refind_theme.status
|
|
@ -224,6 +224,8 @@ kscreen
|
|||
kwallet-pam
|
||||
okular
|
||||
plasma-desktop
|
||||
plasma-wayland-session
|
||||
plasma-wayland-protocols
|
||||
plasma-disks
|
||||
plasma-nm
|
||||
plasma-pa
|
||||
|
@ -664,7 +666,6 @@ melawy-dracut-ukify
|
|||
melawy-refind-menu-generator
|
||||
melawy-etc-skel-std-powerman
|
||||
|
||||
|
||||
melawy-plasma-plasmoid-DittoMenu
|
||||
melawy-plasma-plasmoid-Menu11
|
||||
melawy-plasma-plasmoid-OnzeMenuKDE
|
||||
|
|
|
@ -224,6 +224,8 @@ kscreen
|
|||
kwallet-pam
|
||||
okular
|
||||
plasma-desktop
|
||||
plasma-wayland-session
|
||||
plasma-wayland-protocols
|
||||
plasma-disks
|
||||
plasma-nm
|
||||
plasma-pa
|
||||
|
@ -407,6 +409,8 @@ snapd-glib
|
|||
appimagelauncher
|
||||
ocs-url
|
||||
|
||||
discover
|
||||
|
||||
gvfs
|
||||
gvfs-afc
|
||||
gvfs-gphoto2
|
||||
|
@ -651,6 +655,8 @@ yaml-language-server
|
|||
|
||||
|
||||
## Melawy REPO
|
||||
melawy-hooks
|
||||
melawy-branding
|
||||
|
||||
melawy-arch-linux-updater
|
||||
melawy-plasma-plasmoid-archupdate
|
||||
|
@ -659,7 +665,6 @@ melawy-dracut-initramfs
|
|||
melawy-dracut-ukify
|
||||
melawy-refind-menu-generator
|
||||
melawy-etc-skel-std-powerman
|
||||
melawy-hooks
|
||||
|
||||
melawy-plasma-plasmoid-DittoMenu
|
||||
melawy-plasma-plasmoid-Menu11
|
||||
|
|
|
@ -224,6 +224,8 @@ kscreen
|
|||
kwallet-pam
|
||||
okular
|
||||
plasma-desktop
|
||||
plasma-wayland-session
|
||||
plasma-wayland-protocols
|
||||
plasma-disks
|
||||
plasma-nm
|
||||
plasma-pa
|
||||
|
@ -384,6 +386,8 @@ snapd-glib
|
|||
appimagelauncher
|
||||
ocs-url
|
||||
|
||||
discover
|
||||
|
||||
gvfs
|
||||
gvfs-afc
|
||||
gvfs-gphoto2
|
||||
|
@ -548,6 +552,8 @@ yaml-language-server
|
|||
|
||||
|
||||
## Melawy REPO
|
||||
melawy-hooks
|
||||
melawy-branding
|
||||
|
||||
melawy-arch-linux-updater
|
||||
melawy-plasma-plasmoid-archupdate
|
||||
|
@ -556,7 +562,6 @@ melawy-dracut-initramfs
|
|||
melawy-dracut-ukify
|
||||
melawy-refind-menu-generator
|
||||
melawy-etc-skel-std-powerman
|
||||
melawy-hooks
|
||||
|
||||
melawy-plasma-plasmoid-DittoMenu
|
||||
melawy-plasma-plasmoid-Menu11
|
||||
|
|
|
@ -32,6 +32,7 @@ file_permissions=(
|
|||
["/usr/local/bin/choose-mirror"]="0:0:755"
|
||||
["/usr/local/bin/dmcheck"]="0:0:755"
|
||||
["/usr/local/bin/fix-keys"]="0:0:755"
|
||||
["/usr/local/bin/install_refind_theme"]="0:0:755"
|
||||
["/usr/local/bin/livecd-sound"]="0:0:755"
|
||||
["/usr/local/bin/prepare-live-desktop"]="0:0:755"
|
||||
["/usr/local/bin/remove-virtual-machine-pkgs"]="0:0:755"
|
||||
|
|
Loading…
Reference in New Issue