diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-06 01:47:30 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-06 14:50:48 +0100 |
| commit | 41069fd0e8af924bd764e700123faa9dc5c69b3d (patch) | |
| tree | ac1ace15a9da78bd040a4b22ee0e7ab7039f257d /bin | |
| parent | 84254a822f9be4b100b095e91de3fd96c614afbb (diff) | |
| download | ptxdist-41069fd0e8af924bd764e700123faa9dc5c69b3d.tar.gz ptxdist-41069fd0e8af924bd764e700123faa9dc5c69b3d.tar.xz | |
[ptxdist] consolidate rc file handling
First this patch moves the ptxdistrc file into '~/.ptxdist/' since my
homedir contains quite a low of .ptxdistrcs now.
Then another variable is introduced:
- PTXDIST_VERSION_PTXRC
which holds the the version for the rc file. It consists for simplicity
reasons of just "$year.$month".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index a20561e9e..c96c03d57 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -17,7 +17,7 @@ PTXDIST_PLATFORMCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_platformconfig' PTXDIST_PLATFORMCONFIG_FALLBACK='${PTXDIST_WORKSPACE}/configs/*/platformconfig' PTXDIST_COLLECTIONCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_collectionconfig' PTXDIST_TOOLCHAIN_DEFAULT='${PTXDIST_WORKSPACE}/selected_toolchain' -PTXDIST_PTXRC_DEFAULT='${HOME}/.ptxdistrc.${PTXDIST_VERSION_FULL}' +PTXDIST_PTXRC_DEFAULT='${HOME}/.ptxdist/ptxdistrc-${PTXDIST_VERSION_PTXRC}' # @@ -1718,9 +1718,6 @@ parse_second() boardsetup) check_config - if [ \! -d "${HOME}/.ptxdist" ]; then - mkdir -- "${HOME}/.ptxdist" - fi do_config menuconfig board exit ;; @@ -2007,12 +2004,14 @@ setup_topdir() { # # setup_env() { + local ptxrc + # - # here some ugly hard coded values: + # here an ugly hard coded value: # source "${PTXDIST_TOPDIR}/scripts/ptxdist_version.sh" && + eval ptxrc="${PTXDIST_PTXRC_DEFAULT}" && - local ptxrc="${HOME}/.ptxdistrc.${PTXDIST_VERSION_FULL}" if [ -e "${ptxrc}" ]; then source "${ptxrc}" fi || return @@ -2124,6 +2123,8 @@ setup_config() { local rc_default="${PTXDIST_TOPDIR}/config/setup/ptxdistrc.default" if [ \! -e "${rc_user}" ]; then + local rc_user_dir="${rc_user%/*}" + mkdir -p -- "${rc_user_dir}" && cp -- "${rc_default}" "${rc_user}" || return fi |