From 76da763a0c883bd9d4ca040cd64c7eeb22be2d9e Mon Sep 17 00:00:00 2001
From: Osada Lakmal Paranaliyanage <osadalakmal@gmail.com>
Date: Tue, 8 Nov 2022 09:05:02 +0530
Subject: [PATCH 1/3] Added shellcheck as a github action

Also fixed the issues identified by running shellcheck manually.
---
 .github/workflows/container_build.yml | 10 +++++++++-
 run-vsftpd.sh                         | 24 ++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
index e736882..7cc7ba3 100644
--- a/.github/workflows/container_build.yml
+++ b/.github/workflows/container_build.yml
@@ -7,7 +7,15 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
+    - name: Shellcheck
+      id: Shellcheck
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v3
+        - name: Run ShellCheck
+          uses: ludeeus/action-shellcheck@master
 
     - name: Build Image
       id: build-image
diff --git a/run-vsftpd.sh b/run-vsftpd.sh
index c7018b8..baf4c35 100644
--- a/run-vsftpd.sh
+++ b/run-vsftpd.sh
@@ -7,7 +7,8 @@ fi
 
 # If no env var has been specified, generate a random password for FTP_USER:
 if [ "$FTP_PASS" = "**Random**" ]; then
-    export FTP_PASS=`cat /dev/urandom | tr -dc A-Z-a-z-0-9 | head -c${1:-16}`
+	FTP_PASS=$(tr -dc A-Z-a-z-0-9 </dev/urandom | head -c"${1:-16}")
+	export FTP_PASS
 fi
 
 # Do not log to STDOUT by default:
@@ -26,24 +27,15 @@ echo -e "${FTP_USER}\n${FTP_PASS}" > /etc/vsftpd/virtual_users.txt
 
 # Set passive mode parameters:
 if [ "$PASV_ADDRESS" = "**IPv4**" ]; then
-    export PASV_ADDRESS=$(/sbin/ip route|awk '/default/ { print $3 }')
+    PASV_ADDRESS=$(/sbin/ip route|awk '/default/ { print $3 }')
+    export PASV_ADDRESS
 fi
 
-echo "pasv_address=${PASV_ADDRESS}" >> /etc/vsftpd/vsftpd.conf
-echo "pasv_max_port=${PASV_MAX_PORT}" >> /etc/vsftpd/vsftpd.conf
-echo "pasv_min_port=${PASV_MIN_PORT}" >> /etc/vsftpd/vsftpd.conf
-echo "pasv_addr_resolve=${PASV_ADDR_RESOLVE}" >> /etc/vsftpd/vsftpd.conf
-echo "pasv_enable=${PASV_ENABLE}" >> /etc/vsftpd/vsftpd.conf
-echo "file_open_mode=${FILE_OPEN_MODE}" >> /etc/vsftpd/vsftpd.conf
-echo "local_umask=${LOCAL_UMASK}" >> /etc/vsftpd/vsftpd.conf
-echo "xferlog_std_format=${XFERLOG_STD_FORMAT}" >> /etc/vsftpd/vsftpd.conf
-echo "reverse_lookup_enable=${REVERSE_LOOKUP_ENABLE}" >> /etc/vsftpd/vsftpd.conf
-echo "pasv_promiscuous=${PASV_PROMISCUOUS}" >> /etc/vsftpd/vsftpd.conf
-echo "port_promiscuous=${PORT_PROMISCUOUS}" >> /etc/vsftpd/vsftpd.conf
-echo "listen_port=${LISTEN_PORT}" >> /etc/vsftpd/vsftpd.conf
+{ echo "pasv_address=${PASV_ADDRESS}"; echo "pasv_max_port=${PASV_MAX_PORT}"; echo "pasv_min_port=${PASV_MIN_PORT}"; echo "pasv_addr_resolve=${PASV_ADDR_RESOLVE}"; echo "pasv_enable=${PASV_ENABLE}"; echo "file_open_mode=${FILE_OPEN_MODE}"; echo "local_umask=${LOCAL_UMASK}"; echo "xferlog_std_format=${XFERLOG_STD_FORMAT}"; echo "reverse_lookup_enable=${REVERSE_LOOKUP_ENABLE}"; echo "pasv_promiscuous=${PASV_PROMISCUOUS}"; echo "port_promiscuous=${PORT_PROMISCUOUS}"; echo "listen_port=${LISTEN_PORT}"; } >> /etc/vsftpd/vsftpd.conf
 
 # Get log file path
-export LOG_FILE=`grep xferlog_file /etc/vsftpd/vsftpd.conf|cut -d= -f2`
+LOG_FILE=$(grep xferlog_file /etc/vsftpd/vsftpd.conf|cut -d= -f2)
+export LOG_FILE
 
 # stdout server info:
 if [ ! $LOG_STDOUT ]; then
@@ -63,7 +55,7 @@ cat << EOB
 	· Redirect vsftpd log to STDOUT: No.
 EOB
 else
-    /usr/bin/ln -sf /dev/stdout $LOG_FILE
+    /usr/bin/ln -sf /dev/stdout "$LOG_FILE"
 fi
 
 # Run vsftpd:

From 1dbc8859d17eb5e9664fec31eb3a69f244d493d6 Mon Sep 17 00:00:00 2001
From: Osada Lakmal Paranaliyanage <osadalakmal@gmail.com>
Date: Fri, 11 Nov 2022 07:37:45 +0530
Subject: [PATCH 2/3] corrected syntax

---
 .github/workflows/container_build.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
index 7cc7ba3..479ba5b 100644
--- a/.github/workflows/container_build.yml
+++ b/.github/workflows/container_build.yml
@@ -11,11 +11,7 @@ jobs:
 
     - name: Shellcheck
       id: Shellcheck
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v3
-        - name: Run ShellCheck
-          uses: ludeeus/action-shellcheck@master
+      uses: ludeeus/action-shellcheck@master
 
     - name: Build Image
       id: build-image

From 18c95e60f425e7d66255a2d8004f2bf157e2ca15 Mon Sep 17 00:00:00 2001
From: Osada Lakmal Paranaliyanage <osadalakmal@gmail.com>
Date: Fri, 11 Nov 2022 07:40:01 +0530
Subject: [PATCH 3/3] Add env as well

---
 .github/workflows/container_build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml
index 479ba5b..cb35fd9 100644
--- a/.github/workflows/container_build.yml
+++ b/.github/workflows/container_build.yml
@@ -4,6 +4,7 @@ on: [ push,workflow_dispatch ]
 jobs:
   build:
     name: Build and push image
+    environment: MainCI
     runs-on: ubuntu-20.04
 
     steps: