From cf67d8bbc3c77c9429910a795eb4e436f661a247 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Tue, 18 Dec 2018 13:11:26 +0100 Subject: [PATCH 1/6] Add a script to download signed vm for pharo launcher --- .../README.md | 15 ++++++++++ .../class/basenameVM.st | 3 ++ .../class/pharoLauncher61.st | 3 ++ .../class/worksWithVersion..st | 3 ++ .../instance/description.st | 3 ++ .../instance/generateDownloadVm.st | 29 +++++++++++++++++++ .../instance/vmUrl.st | 3 ++ .../instance/winVmUrl.st | 3 ++ .../properties.json | 11 +++++++ .../ZeroConfVMVersionScript.class/README.md | 10 ++++++- .../properties.json | 2 +- 11 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/README.md create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/basenameVM.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher61.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/description.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/properties.json diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/README.md b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/README.md new file mode 100644 index 0000000..883190c --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/README.md @@ -0,0 +1,15 @@ +I'm there temporary to be able to fetch a signed VM on Windows (used by Pharo Launcher). +for example: + get-files/{version}/pharo-stable.zip + get-files/{version}/pharo-stable-signed.zip + +Generate bash scripts: +dir := FileLocator temp asFileReference. +ZeroConfVMVersionPharoLauncherScript pharoLauncher61 + directory: dir; + be64bits; + generate. +ZeroConfVMVersionPharoLauncherScript pharoLauncher61 + directory: dir; + generate. +dir \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/basenameVM.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/basenameVM.st new file mode 100644 index 0000000..4e5eb7d --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/basenameVM.st @@ -0,0 +1,3 @@ +private +basenameVM + ^ 'signedVm' \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher61.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher61.st new file mode 100644 index 0000000..f8145dc --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher61.st @@ -0,0 +1,3 @@ +instance creation +pharoLauncher61 + ^ self type: 'pharo' release: '61' status: #stable \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st new file mode 100644 index 0000000..399a8dc --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st @@ -0,0 +1,3 @@ +testing +worksWithVersion: version + ^ version = 61 \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/description.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/description.st new file mode 100644 index 0000000..02dd29a --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/description.st @@ -0,0 +1,3 @@ +accessing +description + ^ 'This script downloads the ', self status, ' ', self type capitalized, 'signed VM for ', self release, '.' \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st new file mode 100644 index 0000000..a2494a4 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st @@ -0,0 +1,29 @@ +script generation +generateDownloadVm + self + <<== ('DOWNLOAD signed (if available) {2} VM' format: { self type asUppercase. self release }) + << 'if [ "$OS" == "win" ]; then'; cr; + << (' VM_URL="{1}"' format: { self winVmUrl }); cr; + << 'else'; cr; + << (' VM_URL="{1}"' format: { self vmUrl }); cr; + << 'fi'; cr; + << ('VM_DIR="{1}"' format: { self vmDirectoryPathString }); cr; + << ' +echoerr "Downloading ${VM_TYPE}VM:" +echoerr " $VM_URL" + +mkdir -p $VM_DIR +$DOWNLOAD_TO$VM_DIR/vm.zip $VM_URL + +unzip -q $VM_DIR/vm.zip -d $VM_DIR +rm -rf $VM_DIR/vm.zip + +if [ "$OS" == "win" ]; then + PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME_WINDOWS}.exe` +elif [ "$OS" == "mac" ]; then + PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME}` +elif [ "$OS" == "linux" ]; then + PHARO_VM=`ls $VM_DIR/${VM_BINARY_NAME_LINUX}` +fi + +echo $PHARO_VM'; cr \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st new file mode 100644 index 0000000..9950ecb --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st @@ -0,0 +1,3 @@ +accessing +vmUrl + ^'${FILES_URL}/${VM_TYPE}${VM_ARCH}-${OS}-${VM_STATUS}.zip' \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st new file mode 100644 index 0000000..f531180 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st @@ -0,0 +1,3 @@ +accessing +winVmUrl + ^'${FILES_URL}/${VM_TYPE}${VM_ARCH}-${OS}-${VM_STATUS}-signed.zip' \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/properties.json b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/properties.json new file mode 100644 index 0000000..4eb3d70 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "ChristopheDemarey 12/17/2018 21:12", + "super" : "ZeroConfVMVersionScript", + "category" : "ZeroConf-Unity", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "ZeroConfVMVersionPharoLauncherScript", + "type" : "normal" +} \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionScript.class/README.md b/mc/ZeroConf.package/ZeroConfVMVersionScript.class/README.md index 3cab519..c7734cd 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionScript.class/README.md +++ b/mc/ZeroConf.package/ZeroConfVMVersionScript.class/README.md @@ -1 +1,9 @@ -Temporary script to overcome the migration form single dash "-help" options to double dash "--help" options in the pharo vm. \ No newline at end of file +Temporary script to overcome the migration form single dash "-help" options to double dash "--help" options in the pharo vm. + +You can try me with: +| dir | +dir := FileLocator temp asFileReference. +ZeroConfVMVersionScript pharo40 + directory: dir; + generate. +dir \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionScript.class/properties.json b/mc/ZeroConf.package/ZeroConfVMVersionScript.class/properties.json index 18e0178..82bdc70 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionScript.class/properties.json +++ b/mc/ZeroConf.package/ZeroConfVMVersionScript.class/properties.json @@ -1,5 +1,5 @@ { - "commentStamp" : "", + "commentStamp" : "ChristopheDemarey 12/17/2018 15:35", "super" : "ZeroConfVMScript", "category" : "ZeroConf-Unity", "classinstvars" : [ ], From 991d0e050cf1b23ce5cf405b4f6462dbab03b623 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Tue, 10 Dec 2019 14:20:58 +0100 Subject: [PATCH 2/6] 70 and 80 support --- .../class/pharoLauncher70.st | 3 +++ .../class/pharoLauncher80.st | 3 +++ .../class/worksWithVersion..st | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher70.st create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher80.st diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher70.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher70.st new file mode 100644 index 0000000..bb83545 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher70.st @@ -0,0 +1,3 @@ +instance creation +pharoLauncher70 + ^ self type: 'pharo' release: '70' status: #stable \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher80.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher80.st new file mode 100644 index 0000000..a9b0cf2 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher80.st @@ -0,0 +1,3 @@ +instance creation +pharoLauncher80 + ^ self type: 'pharo' release: '80' status: #stable \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st index 399a8dc..88ca46a 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st @@ -1,3 +1,3 @@ testing worksWithVersion: version - ^ version = 61 \ No newline at end of file + ^ { 61 . 70 . 80 } includes: version \ No newline at end of file From 7d96f01305295525aff11e1ccf7e090bd3560445 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Fri, 24 Sep 2021 11:16:00 +0200 Subject: [PATCH 3/6] Update pharo signed Vm for Pharo 90 --- generated/signedVm90 | 189 ++++++++++++++++++ .../class/pharoLauncher90.st | 3 + .../instance/generateDownloadVm.st | 6 +- .../instance/vmUrl.st | 3 - .../instance/winVmUrl.st | 2 +- 5 files changed, 196 insertions(+), 7 deletions(-) create mode 100644 generated/signedVm90 create mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher90.st delete mode 100644 mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st diff --git a/generated/signedVm90 b/generated/signedVm90 new file mode 100644 index 0000000..7d55de3 --- /dev/null +++ b/generated/signedVm90 @@ -0,0 +1,189 @@ +#!/usr/bin/env bash +# +Pharo Zeroconf Script + + +

Pharo Zeroconf Script

+

This script downloads the stable Pharosigned VM for 90.

+

Usage

+curl https://get.pharo.org/signedVm90 | bash +
+or if curl is not available:
+wget -O- https://get.pharo.org/signedVm90 | bash + +

Artifacts

+ + +
pharoScript to run the downloaded VM in headless mode
pharo-uiScript to run the downloaded VM in UI mode
pharo-vm/Directory containing the VM
+ + \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher90.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher90.st new file mode 100644 index 0000000..4850ec9 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/pharoLauncher90.st @@ -0,0 +1,3 @@ +instance creation +pharoLauncher90 + ^ self stablePharo: '90' \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st index a2494a4..418af22 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st @@ -18,11 +18,11 @@ $DOWNLOAD_TO$VM_DIR/vm.zip $VM_URL unzip -q $VM_DIR/vm.zip -d $VM_DIR rm -rf $VM_DIR/vm.zip -if [ "$OS" == "win" ]; then +if [ "$OSNAME" == "win" ]; then PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME_WINDOWS}.exe` -elif [ "$OS" == "mac" ]; then +elif [ "$OSNAME" == "mac" ]; then PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME}` -elif [ "$OS" == "linux" ]; then +elif [ "$OSNAME" == "linux" ]; then PHARO_VM=`ls $VM_DIR/${VM_BINARY_NAME_LINUX}` fi diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st deleted file mode 100644 index 9950ecb..0000000 --- a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/vmUrl.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -vmUrl - ^'${FILES_URL}/${VM_TYPE}${VM_ARCH}-${OS}-${VM_STATUS}.zip' \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st index f531180..0e50ca1 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st @@ -1,3 +1,3 @@ accessing winVmUrl - ^'${FILES_URL}/${VM_TYPE}${VM_ARCH}-${OS}-${VM_STATUS}-signed.zip' \ No newline at end of file + ^'${FILES_URL}/${VM_TYPE}-vm-${OSNAME}-${VM_ARCH}-${VM_STATUS}-signed.zip' \ No newline at end of file From 8cbc90a63101569062c68e4ac2e68d07a621f303 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Wed, 29 Sep 2021 10:40:50 +0200 Subject: [PATCH 4/6] refactor generateDownloadVm --- .../instance/generateDownloadVm.st | 18 ++--------------- .../generateDownloadVmInstructions.st | 19 ++++++++++++++++++ .../instance/generateDownloadVm.st | 20 +++---------------- .../instance/generateDownloadVm.st | 18 ++--------------- 4 files changed, 26 insertions(+), 49 deletions(-) create mode 100644 mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVmInstructions.st diff --git a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVm.st b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVm.st index 4bc7032..71573ee 100644 --- a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVm.st +++ b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVm.st @@ -6,20 +6,6 @@ generateDownloadVm VM_DIR="' << self vmDirectoryPathString << '" echoerr "Downloading the latest ${VM_TYPE}VM:" -echoerr " $VM_URL" +echoerr " $VM_URL"'; cr. -mkdir -p $VM_DIR -$DOWNLOAD_TO$VM_DIR/vm.zip $VM_URL - -unzip -oq $VM_DIR/vm.zip -d $VM_DIR -rm -rf $VM_DIR/vm.zip - -if [ "$OSNAME" == "Windows" ]; then - PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME_WINDOWS}.exe` -elif [ "$OSNAME" == "Darwin" ]; then - PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME}` -elif [ "$OSNAME" == "Linux" ]; then - PHARO_VM=`ls $VM_DIR/${VM_BINARY_NAME_LINUX}` -fi - -echo $PHARO_VM'; cr + self generateDownloadVmInstructions \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVmInstructions.st b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVmInstructions.st new file mode 100644 index 0000000..03a461e --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateDownloadVmInstructions.st @@ -0,0 +1,19 @@ +as yet unclassified +generateDownloadVmInstructions + self + << ' +mkdir -p $VM_DIR +$DOWNLOAD_TO$VM_DIR/vm.zip $VM_URL + +unzip -q $VM_DIR/vm.zip -d $VM_DIR +rm -rf $VM_DIR/vm.zip + +if [ "$OSNAME" == "Windows" ]; then + PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME_WINDOWS}.exe` +elif [ "$OSNAME" == "Darwin" ]; then + PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME}` +elif [ "$OSNAME" == "Linux" ]; then + PHARO_VM=`ls $VM_DIR/${VM_BINARY_NAME_LINUX}` +fi + +echo $PHARO_VM'; cr \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st index 418af22..c47a2d7 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st @@ -2,7 +2,7 @@ script generation generateDownloadVm self <<== ('DOWNLOAD signed (if available) {2} VM' format: { self type asUppercase. self release }) - << 'if [ "$OS" == "win" ]; then'; cr; + << 'if [ "$OSNAME" == "Windows" ]; then'; cr; << (' VM_URL="{1}"' format: { self winVmUrl }); cr; << 'else'; cr; << (' VM_URL="{1}"' format: { self vmUrl }); cr; @@ -10,20 +10,6 @@ generateDownloadVm << ('VM_DIR="{1}"' format: { self vmDirectoryPathString }); cr; << ' echoerr "Downloading ${VM_TYPE}VM:" -echoerr " $VM_URL" +echoerr " $VM_URL"'; cr. -mkdir -p $VM_DIR -$DOWNLOAD_TO$VM_DIR/vm.zip $VM_URL - -unzip -q $VM_DIR/vm.zip -d $VM_DIR -rm -rf $VM_DIR/vm.zip - -if [ "$OSNAME" == "win" ]; then - PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME_WINDOWS}.exe` -elif [ "$OSNAME" == "mac" ]; then - PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME}` -elif [ "$OSNAME" == "linux" ]; then - PHARO_VM=`ls $VM_DIR/${VM_BINARY_NAME_LINUX}` -fi - -echo $PHARO_VM'; cr \ No newline at end of file + self generateDownloadVmInstructions \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMVersionScript.class/instance/generateDownloadVm.st b/mc/ZeroConf.package/ZeroConfVMVersionScript.class/instance/generateDownloadVm.st index 7cb7bb0..a30f6af 100644 --- a/mc/ZeroConf.package/ZeroConfVMVersionScript.class/instance/generateDownloadVm.st +++ b/mc/ZeroConf.package/ZeroConfVMVersionScript.class/instance/generateDownloadVm.st @@ -6,20 +6,6 @@ generateDownloadVm << ('VM_DIR="{1}"' format: { self vmDirectoryPathString }); cr; << ' echoerr "Downloading the latest ${VM_TYPE}VM:" -echoerr " $VM_URL" +echoerr " $VM_URL"'; cr. -mkdir -p $VM_DIR -$DOWNLOAD_TO$VM_DIR/vm.zip $VM_URL - -unzip -q $VM_DIR/vm.zip -d $VM_DIR -rm -rf $VM_DIR/vm.zip - -if [ "$OSNAME" == "Windows" ]; then - PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME_WINDOWS}.exe` -elif [ "$OSNAME" == "Darwin" ]; then - PHARO_VM=`find $VM_DIR -name ${VM_BINARY_NAME}` -elif [ "$OSNAME" == "Linux" ]; then - PHARO_VM=`ls $VM_DIR/${VM_BINARY_NAME_LINUX}` -fi - -echo $PHARO_VM'; cr \ No newline at end of file + self generateDownloadVmInstructions \ No newline at end of file From 64edc6d295ea8ebfa15f44dfa9c80ed668766146 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Wed, 29 Sep 2021 10:46:13 +0200 Subject: [PATCH 5/6] remove warning on linux 3when trying to run a 32-bits image on a 64-bits system --- .../ZeroConfVMScript.class/instance/generateBody.st | 3 +-- .../instance/generateLinuxScriptTest.st | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateLinuxScriptTest.st diff --git a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateBody.st b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateBody.st index 3555e93..caf4709 100644 --- a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateBody.st +++ b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateBody.st @@ -5,5 +5,4 @@ generateBody generateDetectSystemProperties; cr; cr; generateDownloadVm; cr; cr; generateDownloadSources; cr; cr; - generateVmScriptCreator; cr; cr; - generateLinuxScriptTest \ No newline at end of file + generateVmScriptCreator \ No newline at end of file diff --git a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateLinuxScriptTest.st b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateLinuxScriptTest.st deleted file mode 100644 index 12e992d..0000000 --- a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateLinuxScriptTest.st +++ /dev/null @@ -1,9 +0,0 @@ -script generation -generateLinuxScriptTest - self - <<== 'TEST VM REQUIREMENTS UNDER LINUX' - << 'if [ "$OS" == "linux" ]; then - $PHARO_VM '<< self optionDash <<'help '<< self optionDash <<'vm-display-null &> /dev/null 2>&1 || (\ - echo "On a 64-bit system? You must enable and install the 32-bit libraries"; \ - echo " Please see http://pharo.org/gnu-linux-installation for detailed instructions" ) -fi'; cr From 57c936091170d3ed68e7be1303f39a0439615dcb Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Wed, 29 Sep 2021 10:49:18 +0200 Subject: [PATCH 6/6] Headless option is now the same for all OS --- .../instance/generateVmScriptCreator.st | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateVmScriptCreator.st b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateVmScriptCreator.st index dc563cd..db8c68e 100644 --- a/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateVmScriptCreator.st +++ b/mc/ZeroConf.package/ZeroConfVMScript.class/instance/generateVmScriptCreator.st @@ -21,12 +21,7 @@ set -f # only output the headless option if the VM_SCRIPT name does not include "ui" if [[ "\{$VM_SCRIPT}" != *ui* ]]; then - # output the headless option, which varies under each platform - if [ "$OS" == "linux" ]; then - echo -n " {1}nodisplay " >> $VM_SCRIPT - else - echo -n " {1}headless" >> $VM_SCRIPT - fi + echo -n " {1}headless" >> $VM_SCRIPT fi # forward all arguments unprocessed using $@