From 00a4965efc92423acd814cfd3e11e7e76aec5ae6 Mon Sep 17 00:00:00 2001
From: drake <dragonduckymarino@gmail.com>
Date: Thu, 6 Jun 2024 21:17:31 -0500
Subject: [PATCH] fixes

---
 Jenkinsfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f0fe62c..a1195c5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,30 +50,30 @@ pipeline {
                             def remote = [
                                     name         : 'HostServer',
                                     host         : '192.168.0.216',
-                                    user         : '${env.JOBLINK_LOCAL_USER}',
-                                    password     : '${env.JOBLINK_LOCAL_PASSWD}',
+                                    user         : "${env.JOBLINK_LOCAL_USER}",
+                                    password     : "${env.JOBLINK_LOCAL_PASSWD}",
                                     allowAnyHosts: true,
                             ]
                             if (env.BRANCH_NAME == 'main') {
                                 sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
                                 sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux"
-                                sshPut(from: 'build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
+                                sshPut(from: 'fbla_ui/build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/linux', remote: remote)
                                 sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux"
                                 sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/main/linux/release/"
                                 sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
                                 sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk"
-                                sshPut(from: 'build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
+                                sshPut(from: 'fbla_ui/build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/main/apk', remote: remote)
                                 sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk"
                                 sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/main/apk/release/"
                             } else {
                                 sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
                                 sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux"
-                                sshPut(from: 'build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
+                                sshPut(from: 'fbla_ui/build/linux/x64/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux', remote: remote)
                                 sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux"
                                 sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/dev/linux/release/"
                                 sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
                                 sshCommand remote: remote, command: "mkdir /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk"
-                                sshPut(from: 'build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
+                                sshPut(from: 'fbla_ui/build/app/outputs/apk/release', into: '/home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk', remote: remote)
                                 sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk/release/* /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk"
                                 sshCommand remote: remote, command: "rm -R /home/${env.JOBLINK_LOCAL_USER}/builds/dev/apk/release/"
                             }
@@ -92,13 +92,13 @@ pipeline {
                                     name         : 'MarinoDev',
                                     host         : 'marinodev.com',
                                     port         : 21098,
-                                    user         : '${env.JOBLINK_REMOTE_USER}',
+                                    user         : "${env.JOBLINK_REMOTE_USER}",
                                     identityFile : '/var/jenkins_home/marinoDevPrivateKey',
-                                    passphrase   : '${env.JOBLINK_REMOTE_PASSWD}',
+                                    passphrase   : "${env.JOBLINK_REMOTE_PASSWD}",
                                     allowAnyHosts: true,
                             ]
                             sshRemove(path: '/home/${env.JOBLINK_REMOTE_USER}/public_html/fbla', remote: remote)
-                            sshPut(from: '/var/jenkins_home/workspace/fbla-ui_main/build/web/', into: '/home/${env.JOBLINK_REMOTE_USER}/public_html/', remote: remote)
+                            sshPut(from: 'fbla_ui/build/web/', into: "/home/${env.JOBLINK_REMOTE_USER}/public_html/", remote: remote)
                             sshCommand remote: remote, command: "mv /home/${env.JOBLINK_REMOTE_USER}/public_html/web /home/${env.JOBLINK_REMOTE_USER}/public_html/fbla"
                         }
                     }
@@ -114,7 +114,7 @@ pipeline {
                                     allowAnyHosts: true,
                             ]
                             sshRemove(path: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla', remote: remote)
-                            sshPut(from: 'build/web/', into: '/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver', remote: remote)
+                            sshPut(from: 'fbla_ui/build/web/', into: "/home/${env.JOBLINK_LOCAL_USER}/fbla-webserver", remote: remote)
                             sshCommand remote: remote, command: "mv /home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/web /home/${env.JOBLINK_LOCAL_USER}/fbla-webserver/webfiles/fbla"
                         }
                     }