More fixes.

This commit is contained in:
k1574 2020-11-04 07:48:02 +05:00
parent 6467a4e60e
commit 75f5604243
4 changed files with 11 additions and 7 deletions

1
.gitignore vendored
View file

@ -2,4 +2,5 @@ rcs/vim/.netrwhist
xsrf/cache xsrf/cache
xsrf/certificates xsrf/certificates
xsrf/cookies.txt xsrf/cookies.txt
rcmain

View file

@ -18,6 +18,7 @@ export_loop(){
# Standard variables. # Standard variables.
export_loop \ export_loop \
ENV '$HOME/.shrc' \ ENV '$HOME/.shrc' \
DEV '$HOME/dev' \
LIB '$HOME/lib' \ LIB '$HOME/lib' \
IMG '$HOME/img' \ IMG '$HOME/img' \
SND '$HOME/snd' \ SND '$HOME/snd' \
@ -25,6 +26,10 @@ export_loop \
VID '$HOME/vid' \ VID '$HOME/vid' \
LOAD '$HOME/load' \ LOAD '$HOME/load' \
TXT '$HOME/txt' \ TXT '$HOME/txt' \
SHR '$HOME/shr' \
MNT '$HOME/mnt' \
TMP '$HOME/tmp' \
EXE '$HOME/exe' \
SHPROMPT '"% "' \ SHPROMPT '"% "' \
PS1 '"$SHPROMPT"' \ PS1 '"$SHPROMPT"' \
SUDO_PROMPT '"#"' \ SUDO_PROMPT '"#"' \
@ -33,15 +38,12 @@ export_loop \
GIT_EDITOR '$VISUAL' \ GIT_EDITOR '$VISUAL' \
PAGER 'less' \ PAGER 'less' \
MANPAGER '$PAGER' \ MANPAGER '$PAGER' \
MAN '$SHR/man' \
PROFILE '$HOME/.profile' \ PROFILE '$HOME/.profile' \
TMPL '$HOME/tmpl' \ TMPL '$HOME/tmpl' \
APP '$HOME/app' \ APP '$HOME/app' \
ENVDIR '$HOME/env' \ ENVDIR '$HOME/env' \
SETENV '$LIB/setenv/sh' \ SETENV '$LIB/setenv/sh' \
TMP '$HOME/tmp' \
SHR '$HOME/shr' \
MNT '$HOME/mnt' \
EXE '$EXE/bin' \
GOPATH '$APP/go' \ GOPATH '$APP/go' \
GOEXE '$GOPATH/bin'\ GOEXE '$GOPATH/bin'\
VPATH '$DEV/v'\ VPATH '$DEV/v'\

View file

@ -1,4 +1,4 @@
# jien's rc configuration file. # k1574's rc configuration file.
prompt = '% ' # The simplest possible prompt. prompt = '% ' # The simplest possible prompt.
fn % { fn % {
@ -21,7 +21,7 @@ app = $home/app # Program installation directory.
env = $home/env # Environment setting directory. env = $home/env # Environment setting directory.
dev = $home/dev # Development. dev = $home/dev # Development.
#etc = $local/etc # Configuration files for any system. #etc = $local/etc # Configuration files for any system.
exe = $home/bin # Executable binaries installation directory. exe = $home/exe # Executable binaries installation directory.
tmp = $home/tmp # Temporary. tmp = $home/tmp # Temporary.
shr = $home/shr # Share files for programs. shr = $home/shr # Share files for programs.
man = $shr/man # Directory for manual pages. Are supposed to be written in plain text. man = $shr/man # Directory for manual pages. Are supposed to be written in plain text.
@ -138,3 +138,4 @@ if(test -r $setenv){
. $setenv . $setenv
setenv rc setenv rc
} }

View file

@ -4,7 +4,7 @@
fn setenv { fn setenv {
rc=$1 rc=$1
mkdir -p $dirs mkdir -p $env
# Variables. # Variables.
for(file in $env/$rc/var/* ){ for(file in $env/$rc/var/* ){
test -r $file && `{basename $file} = `{cat $file} test -r $file && `{basename $file} = `{cat $file}