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/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/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/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 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 $@ 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/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/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/class/worksWithVersion..st b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st new file mode 100644 index 0000000..88ca46a --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/class/worksWithVersion..st @@ -0,0 +1,3 @@ +testing +worksWithVersion: version + ^ { 61 . 70 . 80 } includes: version \ 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..c47a2d7 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/generateDownloadVm.st @@ -0,0 +1,15 @@ +script generation +generateDownloadVm + self + <<== ('DOWNLOAD signed (if available) {2} VM' format: { self type asUppercase. self release }) + << 'if [ "$OSNAME" == "Windows" ]; 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"'; cr. + + self generateDownloadVmInstructions \ 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..0e50ca1 --- /dev/null +++ b/mc/ZeroConf.package/ZeroConfVMVersionPharoLauncherScript.class/instance/winVmUrl.st @@ -0,0 +1,3 @@ +accessing +winVmUrl + ^'${FILES_URL}/${VM_TYPE}-vm-${OSNAME}-${VM_ARCH}-${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/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