Skip to content

Commit 308083f

Browse files
authored
fix HOME_DIR and OS_NAME order in common scripts (chef#1626)
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
1 parent 04d0862 commit 308083f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

packer_templates/scripts/_common/guest_tools_parallels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/sh -eux
22

33
# set a default HOME_DIR environment variable if not set
4+
OS_NAME=$(uname -s)
45
if [ "$OS_NAME" = "Darwin" ]; then
56
HOME_DIR="/Users/vagrant"
67
else
78
HOME_DIR="${HOME_DIR:-/home/vagrant}"
89
fi
9-
OS_NAME=$(uname -s)
1010

1111
case "$PACKER_BUILDER_TYPE" in
1212
parallels-iso|parallels-pvm|parallels-ipsw)

packer_templates/scripts/_common/guest_tools_virtualbox.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/sh -eux
22

33
# set a default HOME_DIR environment variable if not set
4+
OS_NAME=$(uname -s)
45
if [ "$OS_NAME" = "Darwin" ]; then
56
HOME_DIR="/Users/vagrant"
67
else
78
HOME_DIR="${HOME_DIR:-/home/vagrant}"
89
fi
9-
OS_NAME=$(uname -s)
1010

1111
case "$PACKER_BUILDER_TYPE" in
1212
virtualbox-iso|virtualbox-ovf)

packer_templates/scripts/_common/guest_tools_vmware.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#!/bin/bash -eux
22

33
# set a default HOME_DIR environment variable if not set
4-
HOME_DIR="${HOME_DIR:-/home/vagrant}"
54
OS_NAME=$(uname -s)
5+
if [ "$OS_NAME" = "Darwin" ]; then
6+
HOME_DIR="/Users/vagrant"
7+
else
8+
HOME_DIR="${HOME_DIR:-/home/vagrant}"
9+
fi
610

711
case "$PACKER_BUILDER_TYPE" in
812
vmware-iso|vmware-vmx)

0 commit comments

Comments
 (0)