modified jenkins and push script

nammayatri · Mar 9, 2024 · e434a28 · e434a28
1 parent 41432bf
commit e434a28
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -84,7 +84,9 @@ pipeline {
                     echo "starting s3 push .........................."
                     def s3Path = "s3://beckn-frontend-assets/${file}"
 
-                    sh ("./push.sh ${file} ${s3Path}")
+                    // sh "cp ./push.sh ."
+                    sh "chmod +x ./push.sh"
+                    sh ("./push.sh ${file}")
                     // sh ("aws s3 cp ./${file} ${s3Path}")
 
                     uploadedFiles += "\n${file}"

diff --git a/push.sh b/push.sh
@@ -38,12 +38,16 @@ check_if_png_is_valid()
 {
   local_path="$1"
   printf "check_if_png_is_valid local_path : $local_path"
-  if pngcheck "$local_path"
-  then
-    image_name=$(echo $local_path | rev | cut -d"/" -f1 | rev)
-    if [[ "$image_name" =~ ^([a-z0-9]|_)*(\.9)?\.png$ ]]
-    then return 0
-    else return 1; fi
+  # if pngcheck "$local_path"
+  # then
+  #   image_name=$(echo $local_path | rev | cut -d"/" -f1 | rev)
+  #   if [[ "$image_name" =~ ^([a-z0-9]|_)*(\.9)?\.png$ ]]
+  #   then return 0
+  #   else return 1; fi
+  # else return 1; fi
+  image_name=$(echo $local_path | rev | cut -d"/" -f1 | rev)
+  if [[ "$image_name" =~ ^([a-z0-9]|_)*(\.9)?\.png$ ]]
+  then return 0
   else return 1; fi
 }