From c4e901df08c9f6df60813ed0913f5b158a3dd97b Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Sat, 21 Oct 2023 00:20:03 -0700 Subject: [PATCH] check all three vars --- latest/sprout | 38 ++++++++++++++++++++++---------------- v0.0.4/sprout | 38 ++++++++++++++++++++++---------------- v0.0.5/sprout | 40 +++++++++++++++++++++++----------------- 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/latest/sprout b/latest/sprout index 9ffa1c3..817ee4f 100755 --- a/latest/sprout +++ b/latest/sprout @@ -22,6 +22,28 @@ case $arch in ;; esac +if [ ! -f /etc/grlx/sprout ]; then + mkdir -p /etc/grlx + if [ -z "$FARMER_INTERFACE" ]; then + echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer." + exit 1 + fi + if [ -z "$FARMER_API_PORT" ]; then + FARMER_PORT=5405 + fi + if [ -z "$FARMER_BUS_PORT" ]; then + FARMER_PORT=5406 + fi + + cat << EOF > /etc/grlx/sprout +farmerinterface: $FARMER_INTERFACE +farmerbusport: $FARMER_BUS_PORT +farmerapiport: $FARMER_API_PORT +farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT +EOF +fi +chmod 600 /etc/grlx/sprout + curl -s "https://artifacts.grlx.dev/${machine_arch}/latest/sprout" > /usr/local/bin/grlx-sprout chmod +x /usr/local/bin/grlx-sprout @@ -43,21 +65,5 @@ Group=root WantedBy=multi-user.target EOF -if [ ! -f /etc/grlx/sprout ]; then - mkdir -p /etc/grlx - if [ -z "$FARMER_INTERFACE" ]; then - echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer." - exit 1 - fi - if [ -z "$FARMER_PORT" ]; then - FARMER_PORT=5405 - fi - cat << EOF > /etc/grlx/sprout - farmerinterface: $FARMER_INTERFACE - farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT - EOF -fi - - systemctl daemon-reload systemctl enable --now grlx-sprout diff --git a/v0.0.4/sprout b/v0.0.4/sprout index 1b95f44..8013541 100755 --- a/v0.0.4/sprout +++ b/v0.0.4/sprout @@ -22,6 +22,28 @@ case $arch in ;; esac +if [ ! -f /etc/grlx/sprout ]; then + mkdir -p /etc/grlx + if [ -z "$FARMER_INTERFACE" ]; then + echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer." + exit 1 + fi + if [ -z "$FARMER_API_PORT" ]; then + FARMER_PORT=5405 + fi + if [ -z "$FARMER_BUS_PORT" ]; then + FARMER_PORT=5406 + fi + + cat << EOF > /etc/grlx/sprout +farmerinterface: $FARMER_INTERFACE +farmerbusport: $FARMER_BUS_PORT +farmerapiport: $FARMER_API_PORT +farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT +EOF +fi +chmod 600 /etc/grlx/sprout + curl -s "https://artifacts.grlx.dev/${machine_arch}/v0.0.4/sprout" > /usr/local/bin/grlx-sprout chmod +x /usr/local/bin/grlx-sprout @@ -43,21 +65,5 @@ Group=root WantedBy=multi-user.target EOF -if [ ! -f /etc/grlx/sprout ]; then - mkdir -p /etc/grlx - if [ -z "$FARMER_INTERFACE" ]; then - echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer." - exit 1 - fi - if [ -z "$FARMER_PORT" ]; then - FARMER_PORT=5405 - fi - cat << EOF > /etc/grlx/sprout - farmerinterface: $FARMER_INTERFACE - farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT - EOF -fi - - systemctl daemon-reload systemctl enable --now grlx-sprout diff --git a/v0.0.5/sprout b/v0.0.5/sprout index ba0f42f..3beaca4 100755 --- a/v0.0.5/sprout +++ b/v0.0.5/sprout @@ -22,7 +22,29 @@ case $arch in ;; esac -curl -f -L -s "https://artifacts.grlx.dev/${machine_arch}/v0.0.5/sprout" > /usr/local/bin/grlx-sprout +if [ ! -f /etc/grlx/sprout ]; then + mkdir -p /etc/grlx + if [ -z "$FARMER_INTERFACE" ]; then + echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer." + exit 1 + fi + if [ -z "$FARMER_API_PORT" ]; then + FARMER_PORT=5405 + fi + if [ -z "$FARMER_BUS_PORT" ]; then + FARMER_PORT=5406 + fi + + cat << EOF > /etc/grlx/sprout +farmerinterface: $FARMER_INTERFACE +farmerbusport: $FARMER_BUS_PORT +farmerapiport: $FARMER_API_PORT +farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT +EOF +fi +chmod 600 /etc/grlx/sprout + +curl -s "https://artifacts.grlx.dev/${machine_arch}/v0.0.5/sprout" > /usr/local/bin/grlx-sprout chmod +x /usr/local/bin/grlx-sprout cat << EOF > /etc/systemd/system/grlx-sprout.service @@ -43,21 +65,5 @@ Group=root WantedBy=multi-user.target EOF -if [ ! -f /etc/grlx/sprout ]; then - mkdir -p /etc/grlx - if [ -z "$FARMER_INTERFACE" ]; then - echo "FARMER_INTERFACE is not set. Please set it to the domain or IP of your farmer." - exit 1 - fi - if [ -z "$FARMER_PORT" ]; then - FARMER_PORT=5405 - fi - cat << EOF > /etc/grlx/sprout - farmerinterface: $FARMER_INTERFACE - farmerurl: https://$FARMER_INTERFACE:$FARMER_PORT - EOF -fi - - systemctl daemon-reload systemctl enable --now grlx-sprout