From 5c22d09a997ae51deec2ce3d7bc575528c135a7d Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Sat, 23 Dec 2023 22:02:26 +0100
Subject: [PATCH 1/3] Refactoring of code

---
 .gitignore     |  3 ++-
 README.md      |  2 +-
 src/pg_bkup.sh | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2a50d4c..8c1eacb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 backup
 data
 compose.yaml
-.env
\ No newline at end of file
+.env
+test.md
\ No newline at end of file
diff --git a/README.md b/README.md
index 075ca9d..b827a04 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ bkup --operation restore --storage s3 --file database_20231217_115621.sql --dbna
 ## Docker run:
 
 ```sh
-docker run --rm --network your_network_name --name pg-bkup -v $PWD/backup:/backup/ -e "DB_HOST=database_host_name" -e "DB_USERNAME=username" -e "DB_PASSWORD=password" jkaninda/pg-bkup:latest  bkup -o backup -d database_name -f napata_20231219_022941.sql.gz
+docker run --rm --network your_network_name --name pg-bkup -v $PWD/backup:/backup/ -e "DB_HOST=database_host_name" -e "DB_USERNAME=username" -e "DB_PASSWORD=password" jkaninda/pg-bkup  bkup -o restore -d database_name -f napata_20231219_022941.sql.gz
 ```
 
 ## Docker compose file:
diff --git a/src/pg_bkup.sh b/src/pg_bkup.sh
index 584debb..c175453 100755
--- a/src/pg_bkup.sh
+++ b/src/pg_bkup.sh
@@ -116,7 +116,7 @@ create_pgpass(){
 }
 backup()
 {
- if [ -z "${DB_HOST}"] ||  [ -z "${DB_NAME}"] ||  [ -z "${DB_USERNAME}"] ||  [ -z "${DB_PASSWORD}"]; then
+if [[ -z $DB_HOST ]] ||  [[ -z $DB_NAME ]] ||  [[ -z $DB_USERNAME ]] ||  [[ -z $DB_PASSWORD ]]; then
    echo "Please make sure all required options are set "
 else
        export PGPASSWORD=${DB_PASSWORD}
@@ -124,6 +124,8 @@ else
 
        ## Backup database
         pg_dump -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USERNAME} -d ${DB_NAME} -v | gzip > ${STORAGE_PATH}/${DB_NAME}_${TIME}.sql.gz
+        echo "$TIME: ${DB_NAME}_${TIME}.sql.gz" | tee -a "${STORAGE_PATH}/history.txt"
+
         echo "Database has been saved"   
 fi
 exit 0
@@ -131,15 +133,13 @@ exit 0
 
 restore()
 {
-if [ -z "${DB_HOST}" ] ||  [ -z "${DB_NAME}" ] ||  [ -z "${DB_USERNAME}" ] || [ -z "${DB_PASSWORD}" ]; then
+if [[ -z $DB_HOST ]] ||  [[ -z $DB_NAME ]] ||  [[ -z $DB_USERNAME ]] || [[ -z $DB_PASSWORD ]]; then
    echo "Please make sure all required options are set "
 else
     ## Restore database
-    export PGPASSWORD=${DB_PASSWORD}
+    export PGPASSWORD=$DB_PASSWORD
      if [ -f "${STORAGE_PATH}/$FILE_NAME" ]; then
-        #pg_restore -h ${DB_HOST} -P ${DB_PORT} -U ${DB_USERNAME} -v -d ${DB_NAME} ${STORAGE_PATH}/$FILE_NAME
-        #cat ${STORAGE_PATH}/${FILE_NAME} | psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USERNAME} -v -d ${DB_NAME} < ${STORAGE_PATH}/$FILE_NAME
-         if gzip -t ${STORAGE_PATH}/$FILE_NAME; then
+         if gzip -t $STORAGE_PATH/$FILE_NAME; then
             zcat ${STORAGE_PATH}/${FILE_NAME} | psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USERNAME} -v -d ${DB_NAME}
          else 
             cat ${STORAGE_PATH}/${FILE_NAME} | psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USERNAME} -v -d ${DB_NAME}
@@ -167,7 +167,7 @@ s3_restore()
 
 mount_s3()
 {
-if [ -z "${ACCESS_KEY}"] ||  [ -z "${SECRET_KEY}"]; then
+if [[ -z $ACCESS_KEY ]] ||  [[ -z $SECRET_KEY ]]; then
 echo "Please make sure all environment variables are set "
 echo "BUCKETNAME=$BUCKETNAME \nACCESS_KEY=$nACCESS_KEY \nSECRET_KEY=$SECRET_KEY"
 else

From 5332d260e41e487e614fd7d516c771220aaa998f Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Sat, 23 Dec 2023 22:03:54 +0100
Subject: [PATCH 2/3] Refactoring of code

---
 .DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 08e5219e6d74e9fe3bf4c506a9e8ea04d76478ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK&2AGh5FRH>v)dMwLy>wxT8V2KLWEEwE+M1`4qO@p2S8yryK0th)=_>MRZ*p!
z;T?DduDl4m4t)LzT5nQ`Lxli&B>P+2Gvo2+i5(LW>&&BvL{%bkQ3N`>sJ4h07iB|A
zx<?o@;p2JA2Vu%Xv_+p4%YbFz?`A;$@TpEQWprWwe%U94{`rR#xd;b(XOz&apmz_W
z^_*U1tw%$eQ)p_J&I(?4e`zQ1o)M=B#RZ#h1sfMOLqsyAnbf~D_30@Nq&vBYb||EP
z26T>i#+$lE^oDM@n2z;{_B9-*$#m9ed}pPyb8Dwk@hW?jcfBEB^k%_qKJ5gPH=^~D
z^E6z42jQzEUi7O6&v-Tqk}RG`gCvTf^7eI-MSRiW^DLT5+nyTmJlE@250}ek^SI_W
zAGNM({<76-)cnWI#?_VQ-o5|e$!Y&Q9cBEZ+#6yzfu-EmxCXI{#+ojAlPu+#*au-#
z&2vM2a5}&aBs2!Mb+m>BzP`XFpA|0b=g?0nx>i4*9S88wX$1cq-eWo{wCi+<y&6$!
z&dZ8fw*Q-UV*UB~9mE-6ZNV1*`E~6hTaFRo5q&_UA=b7vE}74H{~n#v2{N!tFMxHd
zBr<0ziEPeWlrhVM2BwzCVS{HhZ&-B3xO+G3*SfO|SO)%m2E_T`qX=wkTq%@C2P*jl
z06OTFf^YfPALxq?U|Zu#A$lN8nF5t5(@zYhUk*%}W4x{PR|=ImF*!5*=$V;*p)mdM
zV7^o*)>de1%YbFTWT32?RdN5HT>t(zjcm&@U>W$Y7+_Af*X>|Q`flA=oVaU!l=mn?
qgx*S_G(n}WWBDPj;zJZE81uyku&r^W5Iqq4M?lhGE6cziW#A`xI|mE^


From 960a99e98190bc0e222dc438b9cb251e1d462639 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Sat, 23 Dec 2023 22:04:43 +0100
Subject: [PATCH 3/3] Refactoring of code

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8c1eacb..855d1ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ backup
 data
 compose.yaml
 .env
-test.md
\ No newline at end of file
+test.md
+.DS_Store
\ No newline at end of file