fix indentation

master
Alison G. Watson 2019-07-08 20:12:50 -04:00
parent 897bb17346
commit 22fcd99a42
1 changed files with 32 additions and 31 deletions

View File

@ -9,32 +9,33 @@ set dmg
set tmpdir
function rm_if -a name
if test -d $name
rm -rf "$name"
and echo "removed dir $name"
else if test -f $name
rm -f "$name"
and echo "removed file $name"
end
if test -d $name
rm -rf "$name"
and echo "removed dir $name"
else if test -f $name
rm -f "$name"
and echo "removed file $name"
end
return 0
return 0
end
function perish -a ret
rm_if "$tmpdir"
exit "$ret"
rm_if "$tmpdir"
exit "$ret"
end
function err -a ret
echo "error, dropping build"
rm_if "$appdir"
rm_if "$dmg"
perish $ret
echo "error, dropping build"
rm_if "$appdir"
rm_if "$dmg"
perish $ret
end
function :
echo "$argv"
echo
eval "$argv" || err $err_bad_run
echo "$argv"
echo
eval "$argv" || err $err_bad_run
end
set icon_name_Tycho "resources/icons/pfhor-hand_1024@2x.svgz"
@ -43,13 +44,13 @@ set name $argv[1]
set exe $argv[2]
if test ! $name
echo "program name needed (available: Tycho)"
err $err_bad_arg
echo "program name needed (available: Tycho)"
err $err_bad_arg
end
if test ! $exe
echo "full path to executable required (ex. '$_ $name ~/bin/maraiah-tycho')"
err $err_bad_arg
echo "full path to executable required (ex. '$_ $name ~/bin/maraiah-tycho')"
err $err_bad_arg
end
set app $name.app
@ -92,24 +93,24 @@ set dmg $exedir/$name.dmg
: iconutil -c icns -o "$appdir/Contents/Resources/$name.icns" "$icondir"
for lnk in (cat "$exedir"/build/maraiah-tycho-*/out/etc/link.txt)
set lnk (dirname "$lnk")
: cp -r "$lnk" "$appdir/Contents/Frameworks"
set lnk (dirname "$lnk")
: cp -r "$lnk" "$appdir/Contents/Frameworks"
end
echo "success: bundle written to $appdir"
if test ! "$NO_DMG"
echo "creating the disk image..."
echo "creating the disk image..."
: rm_if "$dmg"
: rm_if "$dmg"
: mkdir -p "$diskdir"
: cp -r "$appdir" "$diskdir"
: cp "$srcdir/resources/Image.DS_Store" "$diskdir/.DS_Store"
: ln -s /Applications "$diskdir"
: hdiutil create -volname "$name" -srcfolder "$diskdir" "$dmg"
: mkdir -p "$diskdir"
: cp -r "$appdir" "$diskdir"
: cp "$srcdir/resources/Image.DS_Store" "$diskdir/.DS_Store"
: ln -s /Applications "$diskdir"
: hdiutil create -volname "$name" -srcfolder "$diskdir" "$dmg"
echo "success: dmg written to $dmg"
echo "success: dmg written to $dmg"
end
perish $err_ok