From 061bf429b09947563042abf49e33cae2b2ab9958 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Sat, 27 Jul 2024 22:04:08 +0200 Subject: [PATCH] Prevent unnecessary variables --- winiso/deploy.fish | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/winiso/deploy.fish b/winiso/deploy.fish index ce0d2934..08b6d3d7 100644 --- a/winiso/deploy.fish +++ b/winiso/deploy.fish @@ -16,15 +16,11 @@ begin set -l setupLabel "winiso-valhalla" set -l projectPath "PortValhalla" set -l localProjectPath "sources/\$OEM\$/\$1/$projectPath" - set -l buildDir "$(status dirname)/build" set -l cacheDir ~/.cache/winiso-valhalla - set -l isoFile "$buildDir/winiso-valhalla.iso" set -l winpe "$cacheDir/winpe.iso" set -l winPath "/media/win" set -l winpePath "/media/winpe" set -l valhallaPath "/media/winiso-valhalla" - set -l bootPath "/media/boot" - set -l dataPath "/media/data" set -l winpeOverlay (mktemp -d) set -l winOverlay (mktemp -d) set -l upperDir (mktemp -d) @@ -185,6 +181,8 @@ begin sudo mount --mkdir -t overlay overlay -o lowerdir="$winOverlay":"$winpePath":"$winPath",upperdir="$upperDir",workdir="$workDir" "$valhallaPath" if [ -z "$_flag_usb" ] + set -l isoFile "$(status dirname)/build/winiso-valhalla.iso" + mkisofs \ -V "$setupLabel" \ -no-emul-boot \ @@ -198,6 +196,9 @@ begin -output "$isoFile" \ "$valhallaPath" else + set -l bootPath "/media/boot" + set -l dataPath "/media/data" + set -a mountPaths \ "$bootPath" \ "$dataPath"