mirror of
https://github.com/wahyd4/gvm.git
synced 2026-08-09 04:46:19 +10:00
gvm pkg install manhattan is working!
This commit is contained in:
+30
-16
@@ -4,13 +4,27 @@ if [ "$1" == "" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
display_error() {
|
||||
tput sgr0
|
||||
tput setaf 1
|
||||
echo "ERROR: $1"
|
||||
tput sgr0
|
||||
exit 1
|
||||
}
|
||||
|
||||
[[ $gvm_go_name != "" ]] ||
|
||||
display_error "No Go version selected"
|
||||
[[ $gvm_pkgset_name != "" ]] ||
|
||||
display_error "No package set selected"
|
||||
|
||||
gvm_go_path=$GVM_ROOT/pkgsets/$gvm_go_name/$gvm_pkgset_name
|
||||
cur_dir=`pwd`
|
||||
cur_dirname=`pwd | awk '{ n=split($1,path,"/"); print path[n] }'`
|
||||
cache_dir=$GVM_ROOT/archive/package/$1
|
||||
source_dir=$GVM_ROOT/tmp/$1/src
|
||||
build_dir=$GVM_ROOT/tmp/$1/build
|
||||
package_name=$3
|
||||
version=$4
|
||||
package_name=$1
|
||||
version=$2
|
||||
|
||||
function download_package() {
|
||||
if [ ! -d "$cache_dir" ]; then
|
||||
@@ -46,17 +60,17 @@ function check_deps() {
|
||||
export GOPATH=$build_dir
|
||||
if [ -f "$source_dir/Package.gvm" ]; then
|
||||
for line in `cat $source_dir/Package.gvm | grep ^pkg | awk '{ print $2 }'`; do
|
||||
CUR_PKG=$GVM_ROOT/pkgs/pkg.gvm/$line/current
|
||||
CUR_PKG=$gvm_go_path/pkg.gvm/$line/current
|
||||
if [ -e "$CUR_PKG/BUILD_VERSION" ]; then
|
||||
echo "$line: `cat $CUR_PKG/BUILD_VERSION`" >> $build_dir/manifest
|
||||
else
|
||||
#gvm pkg install $line
|
||||
#if [ $? -ne 0 ]; then
|
||||
# echo "Failed to install dependency $line"
|
||||
# exit 1
|
||||
#fi
|
||||
echo "ERROR: Couldnt find package: $line"
|
||||
exit 1
|
||||
gvm pkg install $line
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to install dependency $line"
|
||||
exit 1
|
||||
fi
|
||||
#echo "ERROR: Couldnt find package: $line"
|
||||
#exit 1
|
||||
fi
|
||||
export GOPATH=$GOPATH:$CUR_PKG
|
||||
done
|
||||
@@ -81,18 +95,18 @@ function build_package() {
|
||||
}
|
||||
|
||||
function install_package() {
|
||||
mkdir -p $GVM_ROOT/pkgs/pkg.gvm/$package_name/$BUILD_NUMBER &&
|
||||
cp -r $build_dir/* $GVM_ROOT/pkgs/pkg.gvm/$package_name/$BUILD_NUMBER &&
|
||||
rm -f $GVM_ROOT/pkgs/pkg.gvm/$package_name/current &&
|
||||
ln -s $GVM_ROOT/pkgs/pkg.gvm/$package_name/$BUILD_NUMBER $GVM_ROOT/pkgs/pkg.gvm/$package_name/current &&
|
||||
mkdir -p $gvm_go_path/pkg.gvm/$package_name/$BUILD_NUMBER &&
|
||||
cp -r $build_dir/* $gvm_go_path/pkg.gvm/$package_name/$BUILD_NUMBER &&
|
||||
rm -f $gvm_go_path/pkg.gvm/$package_name/current &&
|
||||
ln -s $gvm_go_path/pkg.gvm/$package_name/$BUILD_NUMBER $gvm_go_path/pkg.gvm/$package_name/current &&
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: Failed to install"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -d $build_dir/bin ]; then
|
||||
mkdir -p $GVM_ROOT/pkgs/bin &&
|
||||
cp -f $build_dir/bin/* $GVM_ROOT/pkgs/bin/
|
||||
mkdir -p $gvm_go_path/bin &&
|
||||
cp -f $build_dir/bin/* $gvm_go_path/bin/
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
+15
-13
@@ -1,20 +1,22 @@
|
||||
#!/bin/bash
|
||||
if [[ ! -f $GVM_ROOT/go ]]; then
|
||||
echo "ERROR: No Go version selected"
|
||||
exit 1
|
||||
fi
|
||||
if [[ ! -f $GVM_ROOT/pkgs ]]; then
|
||||
echo "ERROR: No package set selected"
|
||||
exit 1
|
||||
fi
|
||||
display_error() {
|
||||
tput sgr0
|
||||
tput setaf 1
|
||||
echo "ERROR: $1"
|
||||
tput sgr0
|
||||
exit 1
|
||||
}
|
||||
|
||||
[[ $gvm_go_name != "" ]] ||
|
||||
display_error "No Go version selected"
|
||||
[[ $gvm_pkgset_name != "" ]] ||
|
||||
display_error "No package set selected"
|
||||
|
||||
CUR_VER=`readlink $GVM_ROOT/go | awk '{ n=split($1,path,"/"); print path[n] }'`
|
||||
CUR_PKGSET=`readlink $GVM_ROOT/pkgs | awk '{ n=split($1,path,"/"); print path[n] }'`
|
||||
echo "
|
||||
gvm packages $CUR_PKGSET@$CUR_VER"
|
||||
gvm packages $gvm_go_name@$gvm_pkgset_name"
|
||||
echo
|
||||
for package in $GVM_ROOT/pkgs/pkg.gvm/*; do
|
||||
if [ $package == "$GVM_ROOT/pkgs/pkg.gvm/*" ]; then
|
||||
for package in $GVM_ROOT/pkgsets/$gvm_go_name/$gvm_pkgset_name/pkg.gvm/*; do
|
||||
if [ $package == "$GVM_ROOT/pkgsets/$gvm_go_name/$gvm_pkgset_name/pkg.gvm/*" ]; then
|
||||
break
|
||||
fi
|
||||
package_name=`echo $package | awk '{ n=split($1,path,"/"); print path[n] }'`
|
||||
|
||||
@@ -24,5 +24,6 @@ echo "export gvm_pkgset_name=\"$1\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 |
|
||||
display_error "Could not extend environment"
|
||||
echo "export GOPATH; GOPATH=\"$GVM_ROOT/pkgsets/release.r60.3/$1:\$GOPATH\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
|
||||
display_error "Could not extend environment"
|
||||
|
||||
echo "export PATH; PATH=\"$GVM_ROOT/pkgsets/release.r60.3/$1/bin:\$PATH\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
|
||||
display_error "Could not extend environment"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user