From d24a36d7aa652475ac6a889537c530cbd3030088 Mon Sep 17 00:00:00 2001
From: adam <git@adamrgrey.com>
Date: Fri, 6 Dec 2024 18:14:24 -0500
Subject: [PATCH] honestly, I think this works

---
 scripts/1clickservice.groovy | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/1clickservice.groovy b/scripts/1clickservice.groovy
index 3a4a530..3778d2e 100644
--- a/scripts/1clickservice.groovy
+++ b/scripts/1clickservice.groovy
@@ -151,8 +151,6 @@ pipeline {
                     
                         sh """#!/bin/bash
 
-                            pushd ${servicename}
-
                             usernameCredsId=\$(uuidgen)
 
                             CRUMB=\$(curl -c cookies.txt 'http://${env.JENKINS_USR}:${env.JENKINS_PSW}@alloces.lan:8080/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
@@ -205,6 +203,7 @@ pipeline {
                             sed -i 's/targetHost=string/targetHost="${targetHost}"/' Jenkinsfile
 
                             rm cookies.txt
+                            pushd ${servicename}
                             git -c core.sshCommand="ssh -i '$PK'\" push
                         """
                     }
@@ -223,7 +222,7 @@ pipeline {
                             curl -u '${env.GITEA_USR}:${env.GITEATOKEN}' https://gitea.arg.rip/greyn/deployment/raw/branch/service/scripts/serviceaccount.sh --output serviceaccount.sh
                             sed -i 's/USERNAMETOADD=/USERNAMETOADD="${servicename}"/' serviceaccount.sh
                             sed -i 's/PASSWORDTOADD=/PASSWORDTOADD="${env.pw_linuxserviceaccount}"/' serviceaccount.sh
-                            sed -i 's/PUBKEYCONTENT=/PUBKEYCONTENT="${env.pubkeycontent}"/' serviceaccount.sh
+                            sed -i 's/PUBKEYCONTENT=/PUBKEYCONTENT="\$(cat ${servicename}-ssh.pub)"/' serviceaccount.sh
                             sed -i 's/SUDOER_PSW=/SUDOER_PSW="${SUDOER_PSW}"/' serviceaccount.sh
 
                             echo "serviceaccount :)"