update log variables

aem-design · Feb 24, 2021 · 4697486 · 4697486
1 parent 857ac69
commit 4697486
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 12 deletions.
diff --git a/aemdesign-aem-author/deploy.ps1 b/aemdesign-aem-author/deploy.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-author/package.ps1 b/aemdesign-aem-author/package.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-common/deploy.ps1 b/aemdesign-aem-common/deploy.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-common/package.ps1 b/aemdesign-aem-common/package.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-core-deploy/deploy.ps1 b/aemdesign-aem-core-deploy/deploy.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-core-deploy/package.ps1 b/aemdesign-aem-core-deploy/package.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-services/deploy.ps1 b/aemdesign-aem-services/deploy.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/aemdesign-aem-services/package.ps1 b/aemdesign-aem-services/package.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/deploy.ps1 b/deploy.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/package.ps1 b/package.ps1
@@ -1,6 +1,6 @@
 Param(
   [string]$LOG_PATH = "${PWD}\logs",
-  [string]$LOG_PEFIX = "${LOG_PATH}\deploy",
+  [string]$LOG_PEFIX = "deploy",
   [string]$LOG_SUFFIX = ".log",
   [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker",
   [string]$AEM_SCHEME = "http",

diff --git a/scripts/functions.ps1 b/scripts/functions.ps1
@@ -289,11 +289,15 @@ Function Main
   $script:DOCKER_LOGS_FOLDER = (createDir $DOCKER_LOGS_FOLDER)
   $script:DRIVER_FOLDER = (createDir $DRIVER_FOLDER)
 
+  Write-Output "${LOG_PATH}"
+
   # set logfile name
   $script:LOG_FILENAME_DATE = "$(DateStamp)"
-  $script:LOG_FILENAME = "${LOG_PATH}\${LOG_PEFIX}-${DOCKER_NETWORK_NAME}-${LOG_FILENAME_DATE}${LOG_SUFFIX}"
+  $script:LOG_FILENAME = "${LOG_PEFIX}-${DOCKER_NETWORK_NAME}-${LOG_FILENAME_DATE}${LOG_SUFFIX}"
   $script:LOG_FILE = "${LOG_PATH}\${LOG_FILENAME}"
 
+  Write-Output "${LOG_FILE}"
+
   $script:LOCAL_IP = (Get-LocalIP)
 
   if (-not($SKIP_CONFIG))
@@ -303,7 +307,7 @@ Function Main
     # load pom file
     [xml]$POM_FILE_XML = (Get-Content $POM_FILE)
 
-    printSectionLine "LOG_PATH: ${LOG_PATH}"
+    printSectionLine "LOG_FILE: ${LOG_FILE}"
     printSectionLine "PARENT_PROJECT_PATH: ${PARENT_PROJECT_PATH}"
     printSectionLine "DEFAULT_POM_FILE: ${DEFAULT_POM_FILE}"
     printSectionLine "POM_FILE: ${POM_FILE}"