Skip to content

Commit 9b18de6

Browse files
committed
Use local for function variables.
Right now srcDir/destDir is used in each function and if someone pass different option to any of that function it will change it for other functions. We should use local for function variables.
1 parent 4f000fd commit 9b18de6

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

createdisk.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function get_git_tag {
2626
}
2727

2828
function create_crc_libvirt_sh {
29-
destDir=$1
29+
local destDir=$1
3030

3131
hostInfo=$(sudo virsh net-dumpxml ${VM_PREFIX} | grep ${VM_PREFIX}-master-0 | sed "s/^[ \t]*//")
3232
masterMac=$(sudo virsh dumpxml ${VM_PREFIX}-master-0 | grep "mac address" | sed "s/^[ \t]*//")
@@ -40,7 +40,7 @@ function create_crc_libvirt_sh {
4040
}
4141

4242
function create_qemu_image {
43-
destDir=$1
43+
local destDir=$1
4444

4545
sudo cp /var/lib/libvirt/images/${VM_PREFIX}-master-0 $destDir
4646
sudo cp /var/lib/libvirt/images/${VM_PREFIX}-base $destDir
@@ -58,8 +58,8 @@ function create_qemu_image {
5858
}
5959

6060
function update_json_description {
61-
srcDir=$1
62-
destDir=$2
61+
local srcDir=$1
62+
local destDir=$2
6363

6464
diskSize=$(du -b $destDir/${CRC_VM_NAME}.qcow2 | awk '{print $1}')
6565
diskSha256Sum=$(sha256sum $destDir/${CRC_VM_NAME}.qcow2 | awk '{print $1}')
@@ -81,8 +81,8 @@ function update_json_description {
8181
}
8282

8383
function copy_additional_files {
84-
srcDir=$1
85-
destDir=$2
84+
local srcDir=$1
85+
local destDir=$2
8686

8787
# Generate the libvirt sh file in source directory to test the disk image if required.
8888
# Don't include this in the destDir so it will not be part of final disk tarball.
@@ -99,8 +99,8 @@ function copy_additional_files {
9999
}
100100

101101
function generate_vbox_directory {
102-
srcDir=$1
103-
destDir=$2
102+
local srcDir=$1
103+
local destDir=$2
104104

105105
cp $srcDir/kubeadmin-password $destDir/
106106
cp $srcDir/kubeconfig $destDir/
@@ -122,9 +122,9 @@ function generate_vbox_directory {
122122
}
123123

124124
function generate_hyperkit_directory {
125-
srcDir=$1
126-
destDir=$2
127-
tmpDir=$3
125+
local srcDir=$1
126+
local destDir=$2
127+
local tmpDir=$3
128128

129129
cp $srcDir/kubeadmin-password $destDir/
130130
cp $srcDir/kubeconfig $destDir/
@@ -143,8 +143,8 @@ function generate_hyperkit_directory {
143143
}
144144

145145
function generate_hyperv_directory {
146-
srcDir=$1
147-
destDir=$2
146+
local srcDir=$1
147+
local destDir=$2
148148

149149
cp $srcDir/kubeadmin-password $destDir/
150150
cp $srcDir/kubeconfig $destDir/

0 commit comments

Comments
 (0)