Kaydet (Commit) dd664ec0 authored tarafından sulincix's avatar sulincix

fixes

üst 75673d4b
...@@ -11,3 +11,4 @@ else ...@@ -11,3 +11,4 @@ else
export DISTRO="Unknown" export DISTRO="Unknown"
fi fi
info "Distro=$DISTRO" info "Distro=$DISTRO"
info "Type=$(uname)"
...@@ -11,10 +11,10 @@ fi ...@@ -11,10 +11,10 @@ fi
set +e set +e
if [ "$TARGET" == "debian" ] ; then if [ "$TARGET" == "debian" ] ; then
if [ "$arch" == "" ] ; then if [ "$arch" == "" ] ; then
[ "$(uname -m)" == "x86_64" ] && export arch="amd64" [ "$(uname -m)" == "x86_64" ] && export arch="amd64" || true
[ "$(uname -m)" == "i686" ] && export arch="i386" [ "$(uname -m)" == "i686" ] && export arch="i386" || true
[ "$(uname -m)" == "aarch64" ] && export arch="arm64" [ "$(uname -m)" == "aarch64" ] && export arch="arm64" || true
[ "$(uname -m)" == "armhf" ] && export arch="arm" [ "$(uname -m)" == "armhf" ] && export arch="arm" || true
fi fi
elif [ "$TARGET" == "inary" ] ; then elif [ "$TARGET" == "inary" ] ; then
if [ "$arch" == "" ] ; then if [ "$arch" == "" ] ; then
...@@ -23,3 +23,4 @@ elif [ "$TARGET" == "inary" ] ; then ...@@ -23,3 +23,4 @@ elif [ "$TARGET" == "inary" ] ; then
fi fi
set -e set -e
info "Target=$TARGET" info "Target=$TARGET"
info "Arch=$arch"
...@@ -6,19 +6,24 @@ for src in ${source[@]} ; do ...@@ -6,19 +6,24 @@ for src in ${source[@]} ; do
srcloc=$(echo $src | sed "s|^.*git://|git://|g") srcloc=$(echo $src | sed "s|^.*git://|git://|g")
srcname=$(echo $src | sed "s|::git://.*$||g") srcname=$(echo $src | sed "s|::git://.*$||g")
echo $srcloc $srcname echo $srcloc $srcname
info "Clonning: $srcloc"
[ -d "$srcname" ] || git clone $srcloc $srcname [ -d "$srcname" ] || git clone $srcloc $srcname
elif echo "$src" | grep "^git+" &>/dev/null ; then elif echo "$src" | grep "^git+" &>/dev/null ; then
srcloc=$(echo $src | sed "s|^git+||g") srcloc=$(echo $src | sed "s|^git+||g")
info "Clonning: $srcloc"
git clone $srcloc || true git clone $srcloc || true
elif echo "$src" | grep "::http" &>/dev/null ; then elif echo "$src" | grep "::http" &>/dev/null ; then
srcloc=$(echo $src | sed "s|^.*::||g") srcloc=$(echo $src | sed "s|^.*::||g")
srcname=$(echo $src | sed "s|::http.*$||g") srcname=$(echo $src | sed "s|::http.*$||g")
echo $srcloc echo $srcloc
info "Downloading: $srcloc"
wget -c $srcloc -O $srcname wget -c $srcloc -O $srcname
echo $srcname | grep ".tar.*" && tar -xf $srcname echo $srcname | grep ".tar.*" && tar -xf $srcname
elif [ -f $src ] ; then elif [ -f $CURDIR/$src ] ; then
touch $src info "Copying: $src"
cp -prfv $CURDIR/$src $WORKDIR/
else else
info "Downloading: $srcloc"
wget -c $src -O $(basename $src) || true wget -c $src -O $(basename $src) || true
basename $src | grep ".tar.*" && tar -xf $(basename $src) || true basename $src | grep ".tar.*" && tar -xf $(basename $src) || true
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment