Prevent unnecessary variables
This commit is contained in:
parent
800261791e
commit
061bf429b0
|
@ -16,15 +16,11 @@ begin
|
||||||
set -l setupLabel "winiso-valhalla"
|
set -l setupLabel "winiso-valhalla"
|
||||||
set -l projectPath "PortValhalla"
|
set -l projectPath "PortValhalla"
|
||||||
set -l localProjectPath "sources/\$OEM\$/\$1/$projectPath"
|
set -l localProjectPath "sources/\$OEM\$/\$1/$projectPath"
|
||||||
set -l buildDir "$(status dirname)/build"
|
|
||||||
set -l cacheDir ~/.cache/winiso-valhalla
|
set -l cacheDir ~/.cache/winiso-valhalla
|
||||||
set -l isoFile "$buildDir/winiso-valhalla.iso"
|
|
||||||
set -l winpe "$cacheDir/winpe.iso"
|
set -l winpe "$cacheDir/winpe.iso"
|
||||||
set -l winPath "/media/win"
|
set -l winPath "/media/win"
|
||||||
set -l winpePath "/media/winpe"
|
set -l winpePath "/media/winpe"
|
||||||
set -l valhallaPath "/media/winiso-valhalla"
|
set -l valhallaPath "/media/winiso-valhalla"
|
||||||
set -l bootPath "/media/boot"
|
|
||||||
set -l dataPath "/media/data"
|
|
||||||
set -l winpeOverlay (mktemp -d)
|
set -l winpeOverlay (mktemp -d)
|
||||||
set -l winOverlay (mktemp -d)
|
set -l winOverlay (mktemp -d)
|
||||||
set -l upperDir (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"
|
sudo mount --mkdir -t overlay overlay -o lowerdir="$winOverlay":"$winpePath":"$winPath",upperdir="$upperDir",workdir="$workDir" "$valhallaPath"
|
||||||
|
|
||||||
if [ -z "$_flag_usb" ]
|
if [ -z "$_flag_usb" ]
|
||||||
|
set -l isoFile "$(status dirname)/build/winiso-valhalla.iso"
|
||||||
|
|
||||||
mkisofs \
|
mkisofs \
|
||||||
-V "$setupLabel" \
|
-V "$setupLabel" \
|
||||||
-no-emul-boot \
|
-no-emul-boot \
|
||||||
|
@ -198,6 +196,9 @@ begin
|
||||||
-output "$isoFile" \
|
-output "$isoFile" \
|
||||||
"$valhallaPath"
|
"$valhallaPath"
|
||||||
else
|
else
|
||||||
|
set -l bootPath "/media/boot"
|
||||||
|
set -l dataPath "/media/data"
|
||||||
|
|
||||||
set -a mountPaths \
|
set -a mountPaths \
|
||||||
"$bootPath" \
|
"$bootPath" \
|
||||||
"$dataPath"
|
"$dataPath"
|
||||||
|
|
Loading…
Reference in a new issue