Apple-2-Tools/a2cloud
1
0
Fork 0
mirror of https://github.com/RasppleII/a2cloud.git synced 2024-11-29 17:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Update nulib2 version to 3.1.0

Browse Source 
Fixes an unfiled bug using the old snapshot where nulib2 fails to
compile on buster/sid systems.  Additionally, we now include the version
of nulib2 we've installed in /usr/local/lib/raspple2 so that we can
upgrade this stuff when the time comes to do so.
This commit is contained in:
T. Joseph Carter 2018-08-05 19:31:32 -07:00
parent 74bb88d1d4
commit 1f8afb6010
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/install_archive_tools
View File

@ -8,7 +8,10 @@
# scripts themselves. Software used or installed by these scripts is subject # scripts themselves. Software used or installed by these scripts is subject
# to other licenses. This work is published from the United States. # to other licenses. This work is published from the United States.
nulib2Version="3.1.0"
a2cBinaryURL="http://blocksfree.com/downloads" a2cBinaryURL="http://blocksfree.com/downloads"
versionDir="/usr/local/lib/raspple2"
# Find the path of our source directory # Find the path of our source directory
a2cSource="$( dirname "${BASH_SOURCE[0]}" )/.." a2cSource="$( dirname "${BASH_SOURCE[0]}" )/.."
@ -24,42 +27,53 @@ fi
. "$a2cSource/scripts/system_ident" -q . "$a2cSource/scripts/system_ident" -q
install_nulib2() { install_nulib2() {
if ! hash nulib2 2> /dev/null; then nulib2installed=
if [[ -f ${versionDir}/nulib2-version ]]; then
read nulib2Installed < ${versionDir}/nulib2-version
fi
echo "A2CLOUD: Installing nulib2..." if [[ $nulib2Installed != $nulib2Version ]]; then
printf "a2cloud: Installing nulib2 %s...\n" "${nulib2Version}"
local nulibWork="$(mktemp -d /tmp/nulib.XXXXXXXXXXXX)" local nulibWork="$(mktemp -d /tmp/nulib.XXXXXXXXXXXX)"
pushd "$nulibWork" >/dev/null pushd "$nulibWork" >/dev/null
if [[ ! $noPicoPkg ]]; then if [[ ! $noPicoPkg ]]; then
### ArchiveTools: Install nulib2 binaries ### ArchiveTools: Install nulib2 binaries
wget -q "${a2cBinaryURL}/picopkg/nulib2-${ras2_os}_${ras2_arch}.tgz" wget -q "${a2cBinaryURL}/picopkg/nulib2-${nulib2Version}_${ras2_os}_${ras2_arch}.tgz"
if [[ -f "nulib2-${ras2_os}_${ras2_arch}.tgz" ]]; then if [[ -f "nulib2-${nulib2Version}_${ras2_os}_${ras2_arch}.tgz" ]]; then
sudo tar Pzxf "nulib2-${ras2_os}_${ras2_arch}.tgz" sudo tar Pzxf "nulib2-${nulib2Version}_${ras2_os}_${ras2_arch}.tgz"
fi fi
fi fi
if ! hash nulib2 2> /dev/null; then if [[ -f ${versionDir}/nulib2-version ]]; then
read nulib2Installed < ${versionDir}/nulib2-version
fi
if [[ $nulib2Installed != $nulib2Version ]]; then
### ArchiveTools: Install nulib2 from source ### ArchiveTools: Install nulib2 from source
sudo apt-get -y install build-essential sudo apt-get -y install build-essential
sudo apt-get -y install zlib1g-dev sudo apt-get -y install zlib1g-dev
sudo apt-get -y clean sudo apt-get -y clean
# install nulib2 # install nulib2
wget -O nulib.tgz http://web.archive.org/web/20131031160750/http://www.nulib.com/downloads/nulibdist.tar.gz wget -O nulib-${nulib2Version}.tar.gz "https://github.com/fadden/nulib2/archive/v${nulib2Version}.tar.gz"
tar zxf nulib.tgz tar zxf nulib-${nulib2Version}.tar.gz
cd nufxlib* cd nulib2-${nulib2Version}/nufxlib
./configure ./configure
make make
sudo make install sudo make install
cd ../nulib2* cd ../nulib2
./configure ./configure
make make
sudo make install sudo make install
sudo install -d -m 755 -o root -g root "${versionDir}"
echo ${nulib2Version} | sudo tee "${versionDir}/nulib2-version" >/dev/null
fi fi
popd >/dev/null popd >/dev/null
rm -rf "$nulibWork" rm -rf "$nulibWork"
else else
echo "A2CLOUD: nulib2 is already installed." printf "a2cloud: nulib2 %s already installed.\n" "${nulib2Version}"
fi fi
} }