changes suggested by checkbashisms script

git-svn-id: https://svn.r-project.org/R/trunk@77305 00db46b3-68df-0310-9c12-caf00c1e9a41
wch · Oct 17, 2019 · 5cc1b76 · 5cc1b76
1 parent c58fa81
commit 5cc1b76
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/scripts/R.sh.in b/src/scripts/R.sh.in
@@ -212,23 +212,31 @@ while test -n "${1}"; do
       args="${args} --file=$a"
       ;;
     --no-environ)
-      export R_ENVIRON=''
-      export R_ENVIRON_USER=''
+      R_ENVIRON=''
+      export R_ENVIRON
+      R_ENVIRON_USER=''
+      export R_ENVIRON_USER
       args="${args} ${1}"
       ;;
     --no-site-file)
-      export R_PROFILE=''
+      R_PROFILE=''
+      export R_PROFILE
       args="${args} ${1}"
       ;;
     --no-init-file)
-      export R_PROFILE_USER=''
+      R_PROFILE_USER=''
+      export R_PROFILE_USER
       args="${args} ${1}"
       ;;
     --vanilla)
-      export R_ENVIRON=''
-      export R_ENVIRON_USER=''
-      export R_PROFILE=''
-      export R_PROFILE_USER=''
+      R_ENVIRON=''
+      export R_ENVIRON
+      R_ENVIRON_USER=''
+      export R_ENVIRON_USER
+      R_PROFILE=''
+      export R_PROFILE
+      R_PROFILE_USER=''
+      export R_PROFILE_USER
       args="${args} ${1}"
       ;;
     *)

diff --git a/src/scripts/config b/src/scripts/config
@@ -249,7 +249,7 @@ if test "${personal}" = "yes"; then
   if test "${R_OSTYPE}" = "windows"; then
     if test -f "${R_MAKEVARS_USER}"; then
       makefiles="${makefiles} -f \"${R_MAKEVARS_USER}\""
-    elif test ${R_ARCH} = "/x64" -a -f "${HOME}/.R/Makevars.win64"; then
+    elif test ${R_ARCH} = "/x64" && test -f "${HOME}/.R/Makevars.win64"; then
       makefiles="${makefiles} -f \"${HOME}\"/.R/Makevars.win64"
     elif test -f "${HOME}/.R/Makevars.win"; then
       makefiles="${makefiles} -f \"${HOME}\"/.R/Makevars.win"