jn
/
punkshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

try different upstream url for getpunk script, fixes for fetchruntime on linux

master
Julian Noble 4 days ago
parent
d6686dbd03
commit
b071eef577
5 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      bin/fetchruntime.cmd
  2. 4
      getpunk.cmd
  3. 6
      src/scriptapps/fetchruntime.bash
  4. 2
      src/scriptapps/getpunk.bash
  5. 2
      src/scriptapps/getpunk.ps1

6
bin/fetchruntime.cmd
Unescape View File

@ -681,11 +681,11 @@ if [[ "$OSTYPE" == "linux"* ]]; then
if [[ "$arch" == "x86_64"* ]]; then if [[ "$arch" == "x86_64"* ]]; then
url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-intel-dyn" url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-intel-dyn"
output="../src/runtime/tclkit-902-Linux64-intel-dyn" output="../src/runtime/tclkit-902-Linux64-intel-dyn"
$runtime_available=1 runtime_available=1
elif [[ "$arch" == "arm"* ]]; then elif [[ "$arch" == "arm"* ]]; then
url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-arm-dyn" url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-arm-dyn"
output="../src/runtime/tclkit-902-Linux64-arm-dyn" output="../src/runtime/tclkit-902-Linux64-arm-dyn"
$runtime_available=1 runtime_available=1
fi fi
if [[ "$runtime_available" -eq 1 ]]; then if [[ "$runtime_available" -eq 1 ]]; then
echo "Please ensure libxFt.so.2 is available" echo "Please ensure libxFt.so.2 is available"
@ -697,7 +697,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
#assumed to be Mach-O 'universal binaries' for both x86-64 and arm? - REVIEW #assumed to be Mach-O 'universal binaries' for both x86-64 and arm? - REVIEW
url="${url_kitbase}/macosx/tclkit-902-Darwin64-dyn" url="${url_kitbase}/macosx/tclkit-902-Darwin64-dyn"
output="../src/runtime/tclkit-902-Darwin64-dyn" output="../src/runtime/tclkit-902-Darwin64-dyn"
$runtime_available=1 runtime_available=1
elif [[ "$OSTYPE" == "freebsd"* ]]; then elif [[ "$OSTYPE" == "freebsd"* ]]; then
os="freebsd" os="freebsd"
elif [[ "$OSTYPE" == "dragonflybsd"* ]]; then elif [[ "$OSTYPE" == "dragonflybsd"* ]]; then

4
getpunk.cmd
Unescape View File

@ -613,7 +613,7 @@ fi
#<shell-payload> #<shell-payload>
git_upstream="https://www.gitea1.intx.com.au/jn/punkshell" git_upstream="https://gitea1.intx.com.au/jn/punkshell.git"
#review - how can we test if another url such as ssh://git@pcm-gitea1.corp.intx.com.au:2222/jn/punkshell is actually the same repo, without cloning and comparing files/history? #review - how can we test if another url such as ssh://git@pcm-gitea1.corp.intx.com.au:2222/jn/punkshell is actually the same repo, without cloning and comparing files/history?
if ! command -v git &> /dev/null; then if ! command -v git &> /dev/null; then
@ -914,7 +914,7 @@ if ($matches.count) {
#check if git available #check if git available
#if not, check/install winget, winget git #if not, check/install winget, winget git
$git_upstream = "https://www.gitea1.intx.com.au/jn/punkshell" $git_upstream = "https://gitea1.intx.com.au/jn/punkshell.git"
$launchdir = Get-Location #store original CWD $launchdir = Get-Location #store original CWD
$scriptfolder = Resolve-Path (Split-Path -Path $PSCommandPath -Parent) $scriptfolder = Resolve-Path (Split-Path -Path $PSCommandPath -Parent)
$punkfolder = "" $punkfolder = ""

6
src/scriptapps/fetchruntime.bash
Unescape View File

@ -6,11 +6,11 @@ if [[ "$OSTYPE" == "linux"* ]]; then
if [[ "$arch" == "x86_64"* ]]; then if [[ "$arch" == "x86_64"* ]]; then
url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-intel-dyn" url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-intel-dyn"
output="../src/runtime/tclkit-902-Linux64-intel-dyn" output="../src/runtime/tclkit-902-Linux64-intel-dyn"
$runtime_available=1 runtime_available=1
elif [[ "$arch" == "arm"* ]]; then elif [[ "$arch" == "arm"* ]]; then
url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-arm-dyn" url="${url_kitbase}/linux-x86_64/tclkit-902-Linux64-arm-dyn"
output="../src/runtime/tclkit-902-Linux64-arm-dyn" output="../src/runtime/tclkit-902-Linux64-arm-dyn"
$runtime_available=1 runtime_available=1
fi fi
if [[ "$runtime_available" -eq 1 ]]; then if [[ "$runtime_available" -eq 1 ]]; then
echo "Please ensure libxFt.so.2 is available" echo "Please ensure libxFt.so.2 is available"
@ -22,7 +22,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
#assumed to be Mach-O 'universal binaries' for both x86-64 and arm? - REVIEW #assumed to be Mach-O 'universal binaries' for both x86-64 and arm? - REVIEW
url="${url_kitbase}/macosx/tclkit-902-Darwin64-dyn" url="${url_kitbase}/macosx/tclkit-902-Darwin64-dyn"
output="../src/runtime/tclkit-902-Darwin64-dyn" output="../src/runtime/tclkit-902-Darwin64-dyn"
$runtime_available=1 runtime_available=1
elif [[ "$OSTYPE" == "freebsd"* ]]; then elif [[ "$OSTYPE" == "freebsd"* ]]; then
os="freebsd" os="freebsd"
elif [[ "$OSTYPE" == "dragonflybsd"* ]]; then elif [[ "$OSTYPE" == "dragonflybsd"* ]]; then

2
src/scriptapps/getpunk.bash
Unescape View File

@ -1,6 +1,6 @@
git_upstream="https://www.gitea1.intx.com.au/jn/punkshell" git_upstream="https://gitea1.intx.com.au/jn/punkshell.git"
#review - how can we test if another url such as ssh://git@pcm-gitea1.corp.intx.com.au:2222/jn/punkshell is actually the same repo, without cloning and comparing files/history? #review - how can we test if another url such as ssh://git@pcm-gitea1.corp.intx.com.au:2222/jn/punkshell is actually the same repo, without cloning and comparing files/history?
if ! command -v git &> /dev/null; then if ! command -v git &> /dev/null; then

2
src/scriptapps/getpunk.ps1
Unescape View File

@ -6,7 +6,7 @@
#check if git available #check if git available
#if not, check/install winget, winget git #if not, check/install winget, winget git
$git_upstream = "https://www.gitea1.intx.com.au/jn/punkshell" $git_upstream = "https://gitea1.intx.com.au/jn/punkshell.git"
$launchdir = Get-Location #store original CWD $launchdir = Get-Location #store original CWD
$scriptfolder = Resolve-Path (Split-Path -Path $PSCommandPath -Parent) $scriptfolder = Resolve-Path (Split-Path -Path $PSCommandPath -Parent)
$punkfolder = "" $punkfolder = ""

Write Preview
Loading…
Cancel
Save