From dcf9e96aa3a3530b6f0e6afba8dc0c102b89dd51 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 02 Jul 2020 18:36:56 -0400 Subject: Prefix "static" vars with "_" --- (limited to 'src/vardata.sh') diff --git a/src/vardata.sh b/src/vardata.sh index 6c19077..24fc4c3 100644 --- a/src/vardata.sh +++ b/src/vardata.sh @@ -18,9 +18,9 @@ # along with the ProteanOS Development Kit. If not, see # . -VARDATA_DIRS='mount' +_VARDATA_DIRS='mount' -vardatadir= +_vardatadir= init_vardata() { @@ -34,15 +34,15 @@ init_vardata() fi rand - vardatadir="${tmpdir}/${PACKAGE}-$(printf '%010d' ${rand_x})" - if ! mkdir -- "${vardatadir}"; then - error "$(get_msg 'temp_mkdir_fail')" "${vardatadir}" + _vardatadir="${tmpdir}/${PACKAGE}-$(printf '%010d' ${rand_x})" + if ! mkdir -- "${_vardatadir}"; then + error "$(get_msg 'temp_mkdir_fail')" "${_vardatadir}" return 1 fi - for dir in ${VARDATA_DIRS}; do - if ! mkdir -- "${vardatadir}/${dir}"; then + for dir in ${_VARDATA_DIRS}; do + if ! mkdir -- "${_vardatadir}/${dir}"; then error "$(get_msg 'temp_mkdir_fail')" \ - "${vardatadir}/${dir}" + "${_vardatadir}/${dir}" return 1 fi done @@ -54,15 +54,15 @@ fini_vardata() { local dir='' - for dir in ${VARDATA_DIRS}; do - if ! rmdir -- "${vardatadir}/${dir}"; then + for dir in ${_VARDATA_DIRS}; do + if ! rmdir -- "${_vardatadir}/${dir}"; then error "$(get_msg 'temp_rmdir_fail')" \ - "${vardatadir}/${dir}" + "${_vardatadir}/${dir}" return 1 fi done - if ! rmdir -- "${vardatadir}"; then - error "$(get_msg 'temp_rmdir_fail')" "${vardatadir}" + if ! rmdir -- "${_vardatadir}"; then + error "$(get_msg 'temp_rmdir_fail')" "${_vardatadir}" return 1 fi @@ -74,9 +74,9 @@ get_vardata_dir() local dir="${1}" shift 1 - case " ${VARDATA_DIRS} " in + case " ${_VARDATA_DIRS} " in *" ${dir} "*) - printf '%s/%s' "${vardatadir}" "${dir}" + printf '%s/%s' "${_vardatadir}" "${dir}" ;; esac -- cgit v0.9.1