tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 23:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #57 from hardliner66/make_build_scripts_runable_from_every_directory

Browse source 
Change build scripts to be independent from the working directory
This commit is contained in:
TomAwezome 2022-05-05 06:27:52 -04:00 committed by GitHub
commit 3cfb7d1451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build/build-iso.ps1
View file

@ -1,6 +1,17 @@
if (!((Split-Path -Path (Get-Location) -Leaf) -eq "build"))
# make sure we are in the correct directory
$currentDir=Get-Location
if ("$currentDir" -ne "$PSScriptRoot")
{
Write-Output "This script must be run inside the build folder. Press ENTER to exit."; Read-Host; exit
try
{
pushd "$PSScriptRoot"
. $PSCommandPath $args
}
finally
{
popd
}
exit
}
if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator))

11
build/build-iso.sh
View file

@ -2,7 +2,16 @@
# Build Distro ISO using AUTO.ISO minimal auto-install as bootstrap to merge codebase, recompile system, and export ISO
# Run this script inside build/ directory
# make sure we are in the correct directory
SCRIPT_DIR=$(realpath "$(dirname "$0")")
SCRIPT_NAME=$(basename "$0")
EXPECTED_DIR=$(realpath "$PWD")
if test "${EXPECTED_DIR}" != "${SCRIPT_DIR}"
then
( cd "$SCRIPT_DIR" || exit ; "./$SCRIPT_NAME" "$@" );
exit
fi
# Uncomment if you use doas instead of sudo
#alias sudo=doas

29
build/sync.ps1
View file

@ -1,4 +1,20 @@
$choice = $args[0]
# make sure we are in the correct directory
$currentDir=Get-Location
if ("$currentDir" -ne "$PSScriptRoot")
{
try
{
pushd "$PSScriptRoot"
. $PSCommandPath $args
}
finally
{
popd
}
exit
}
$choice = $args[0]
function print_usage()
{
@ -19,11 +35,6 @@ if ($choice -ne 'repo' -and $choice -ne "vm")
print_usage
}
if (!((Split-Path -Path (Get-Location) -Leaf) -eq "build"))
{
Write-Output "This script must be run inside the build folder. Press ENTER to exit."; Read-Host; exit
}
if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator))
{
Write-Output "This script must be run as Adminstrator. Press ENTER to exit."; Read-Host; exit
@ -41,9 +52,9 @@ Write-Output "QEMU installation found."
# Set this
$ZEALDISK=""
# Examples:
#$ZEALDISK = "$HOME\VirtualBox VMs\ZEAL\ZEAL.vdi"
#$ZEALDISK="$HOME\vmware\ZealOS\ZealOS.vmdk"
# Examples:
#$ZEALDISK = "$HOME\VirtualBox VMs\ZEAL\ZEAL.vdi"
#$ZEALDISK="$HOME\vmware\ZealOS\ZealOS.vmdk"
#$ZEALDISK="ZealOS.qcow2"
if ($ZEALDISK -eq "")

13
build/sync.sh
View file

@ -1,12 +1,23 @@
#!/bin/sh
#
# Sync VM <--> Repo.
# Run this script inside build/ directory.
#
# On copying from virtual disk to src/, the directory is emptied before copy. Comment out "rm -rf ../src/*" to copy onto src.
#
#
# make sure we are in the correct directory
SCRIPT_DIR=$(realpath "$(dirname "$0")")
SCRIPT_NAME=$(basename "$0")
EXPECTED_DIR=$(realpath "$PWD")
if test "${EXPECTED_DIR}" != "${SCRIPT_DIR}"
then
( cd "$SCRIPT_DIR" || exit ; "./$SCRIPT_NAME" "$@" );
exit
fi
# Uncomment if you use doas instead of sudo
#alias sudo=doas