Fixed mks installation.
This commit is contained in:
parent
efa48101b0
commit
c3eea5be73
4 changed files with 5 additions and 4 deletions
|
@ -6,7 +6,6 @@ EXEDIR = $(HOME)/exe
|
||||||
APPDIR = $(HOME)/app
|
APPDIR = $(HOME)/app
|
||||||
SHRDIR = $(HOME)/shr
|
SHRDIR = $(HOME)/shr
|
||||||
INCDIR = $SHRDIR/inc
|
INCDIR = $SHRDIR/inc
|
||||||
MKINCDIR = $APPDIR/mk/inc
|
|
||||||
OBJDIR = $SHRDIR/obj
|
OBJDIR = $SHRDIR/obj
|
||||||
MANDIR = $SHRDIR/man
|
MANDIR = $SHRDIR/man
|
||||||
INSTALLDIRS = $OBJDIR $MANDIR $EXEDIR $INCDIR $APPDIR
|
INSTALLDIRS = $OBJDIR $MANDIR $EXEDIR $INCDIR $APPDIR
|
||||||
|
|
|
@ -26,7 +26,7 @@ build-sh :VQ:
|
||||||
fi
|
fi
|
||||||
command cd $pwd
|
command cd $pwd
|
||||||
done
|
done
|
||||||
clean:V:
|
clean:VQ:
|
||||||
pwd=`pwd`
|
pwd=`pwd`
|
||||||
names=`command cd src/cmd && goblin ls && command cd $pwd`
|
names=`command cd src/cmd && goblin ls && command cd $pwd`
|
||||||
for name in $names ; do
|
for name in $names ; do
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
wd=`pwd`
|
wd=`pwd`
|
||||||
|
|
||||||
cd src/cmd/goblin && go install && cd $wd
|
cd src/cmd/goblin && go install&& cd $wd
|
||||||
|
|
||||||
mkdir -p $HOME/app/goblin
|
mkdir -p $HOME/app/goblin
|
||||||
cp -rf app/* $HOME/app/goblin
|
cp -rf app/* $HOME/app/goblin
|
||||||
|
|
|
@ -326,9 +326,11 @@ func Run(args []string) {
|
||||||
arg0 := args[0]
|
arg0 := args[0]
|
||||||
args = args[1:]
|
args = args[1:]
|
||||||
|
|
||||||
if mkincdir := os.Getenv("MKINCDIR") ; mkincdir == "" {
|
if mkincdir := os.Getenv("MKINCDIR") ;
|
||||||
|
mkincdir == "" {
|
||||||
homeDir, _ := os.UserHomeDir()
|
homeDir, _ := os.UserHomeDir()
|
||||||
os.Setenv("MKINCDIR", homeDir + "/app/goblin/mk/inc" )
|
os.Setenv("MKINCDIR", homeDir + "/app/goblin/mk/inc" )
|
||||||
|
fmt.Println("shit:", os.Getenv("MKINCDIR"))
|
||||||
}
|
}
|
||||||
|
|
||||||
flags := flag.NewFlagSet(arg0, flag.ExitOnError)
|
flags := flag.NewFlagSet(arg0, flag.ExitOnError)
|
||||||
|
|
Loading…
Reference in a new issue