setup.txt: Use deb of unar if it exists (jessie+)

This commit is contained in:
T. Joseph Carter 2015-11-17 16:22:26 -08:00
parent 2718d81572
commit e943aa7823

View File

@ -1226,40 +1226,44 @@ if [[ $installArchiveTools ]]; then
# download and install The Unarchiver, for expanding apple.com disk images # download and install The Unarchiver, for expanding apple.com disk images
# http://wakaba.c3.cx/s/apps/unarchiver.html # http://wakaba.c3.cx/s/apps/unarchiver.html
if [[ ! -f /usr/local/bin/unar ]]; then if ! command -v unar >/dev/null; then
echo "A2CLOUD: Installing The Unarchiver..." echo "A2CLOUD: Installing The Unarchiver..."
cd /tmp/a2cloud-install if apt-cache show unar &>/dev/null; then
if [[ $downloadBinaries ]]; then sudo apt-get -y install unar
if [[ $isRpi || $isDebian ]]; then else
sudo apt-get -y install libgnustep-base1.22 cd /tmp/a2cloud-install
sudo apt-get -y clean if [[ $downloadBinaries ]]; then
if [[ $isRpi ]]; then if [[ $isRpi || $isDebian ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-rpi.tgz | sudo tar Pzx sudo apt-get -y install libgnustep-base1.22
elif [[ $isDebian ]]; then sudo apt-get -y clean
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-debian7_x86.tgz | sudo tar Pzx if [[ $isRpi ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-rpi.tgz | sudo tar Pzx
elif [[ $isDebian ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-debian7_x86.tgz | sudo tar Pzx
fi
fi fi
fi fi
if ! command -v unar >/dev/null; then
sudo apt-get -y install build-essential
sudo apt-get -y install libgnustep-base-dev libz-dev libbz2-dev
sudo apt-get -y install libssl-dev libicu-dev unzip
sudo apt-get -y clean
rm -rf unar &> /dev/null
mkdir -p unar
cd unar
wget -q -nc http://theunarchiver.googlecode.com/files/unar1.7_src.zip
unzip -o unar1.7_src.zip
cd The\ Unarchiver/XADMaster
make -f Makefile.linux
sudo mv lsar unar /usr/local/bin
cd ../Extra
sudo mkdir -p /usr/local/man/man1
sudo mv lsar.1 unar.1 /usr/local/man/man1
cd /tmp/a2cloud-install
rm -rf unar
fi
sudo mandb &> /dev/null
fi fi
if [[ ! -f /usr/local/bin/unar ]]; then
sudo apt-get -y install build-essential
sudo apt-get -y install libgnustep-base-dev libz-dev libbz2-dev
sudo apt-get -y install libssl-dev libicu-dev unzip
sudo apt-get -y clean
rm -rf unar &> /dev/null
mkdir -p unar
cd unar
wget -q -nc http://theunarchiver.googlecode.com/files/unar1.7_src.zip
unzip -o unar1.7_src.zip
cd The\ Unarchiver/XADMaster
make -f Makefile.linux
sudo mv lsar unar /usr/local/bin
cd ../Extra
sudo mkdir -p /usr/local/man/man1
sudo mv lsar.1 unar.1 /usr/local/man/man1
cd /tmp/a2cloud-install
rm -rf unar
fi
sudo mandb &> /dev/null
else else
echo "A2CLOUD: The Unarchiver is already installed." echo "A2CLOUD: The Unarchiver is already installed."
fi fi
@ -1418,7 +1422,7 @@ if [[ $a2CloudDisk ]]; then
acmd -g /usr/local/adtpro/disks/VDRIVE-*DSK VEDRIVE.CONFIG - | acmd -p "$a2CloudDisk" VEDRIVE.CONFIG BAS acmd -g /usr/local/adtpro/disks/VDRIVE-*DSK VEDRIVE.CONFIG - | acmd -p "$a2CloudDisk" VEDRIVE.CONFIG BAS
# Apple System Utilities 3.1 support files # Apple System Utilities 3.1 support files
if [[ -f /usr/local/bin/unar ]]; then if command -v unar >/dev/null; then
echo "A2CLOUD: Downloading and copying System Utilities support files..." echo "A2CLOUD: Downloading and copying System Utilities support files..."
cd /tmp/a2cloud-install cd /tmp/a2cloud-install
wget -qO Apple_II_System_Disk_3.2.sea.bin http://archive.org/download/download.info.apple.com.2012.11/download.info.apple.com.2012.11.zip/download.info.apple.com%2FApple_Support_Area%2FApple_Software_Updates%2FEnglish-North_American%2FApple_II%2FApple_II_Supplemental%2FApple_II_System_Disk_3.2.sea.bin wget -qO Apple_II_System_Disk_3.2.sea.bin http://archive.org/download/download.info.apple.com.2012.11/download.info.apple.com.2012.11.zip/download.info.apple.com%2FApple_Support_Area%2FApple_Software_Updates%2FEnglish-North_American%2FApple_II%2FApple_II_Supplemental%2FApple_II_System_Disk_3.2.sea.bin