install.fish

@@ -1,6 +0,0 @@
-#!/bin/fish
-cp ./pacman/snap-pac-uki-create.fish /usr/local/bin
-echo "installed creation script."
-
-cp ./pacman/hooks/* /usr/share/libalpm/hooks/
-echo "installed pacman hooks."

pacman/hooks/01_snap-pac-uki_pre.hook

@@ -1,12 +0,0 @@
-[Trigger]
-Operation = Upgrade
-Operation = Install
-Operation = Remove
-Type = Package
-Target = *
-
-[Action]
-Description = Performing pre UKI creation...
-When = PreTransaction
-Exec = /usr/local/bin/snap-pac-uki-create.fish
-AbortOnFail

pacman/hooks/zz_snap-pac-uki_post.hook

@@ -1,11 +0,0 @@
-[Trigger]
-Operation = Upgrade
-Operation = Install
-Operation = Remove
-Type = Package
-Target = *
-
-[Action]
-Description = Performing post UKI creation...
-When = PostTransaction
-Exec = /usr/local/bin/snap-pac-uki-create.fish

scripts/snap-pac-uki_create.fish

@@ -98,7 +98,7 @@ function create_uki -d "creates a new uki"
 end
 
 function add_efi_entry -d "adds a boot entry to efi"
-    efibootmgr -C -d $EFI_DEV -p $EFI_PART -l "$EFI_PATH\arch-linux-$SNAPSHOT_ID.efi" -L (rg "PRETTY_NAME" "$BUILD_PATH/$SNAPSHOT_ID/os-release-snapshot" | sed "s/PRETTY_NAME=\"\(.*\)\"/\1/") -q
+    efibootmgr -C -d $EFI_DEV -p $EFI_PART -l "$EFI_PATH\arch-linux-$SNAPSHOT_ID.efi" -L (rg "PRETTY_NAME" "$BUILD_PATH/$SNAPSHOT_ID/os-release-snapshot" | sed "s/PRETTY_NAME=\"\(.*\)\"/\1/")
 end
 
 function main -d "the main function"
@@ -107,9 +107,9 @@ function main -d "the main function"
 
     get_last_snapshot
     create_uki
+    add_efi_entry
 
     cp $BUILD_PATH/$SNAPSHOT_ID/*.efi "$EFI_DIR"
-    add_efi_entry
 
     exit 0
 end