Skip to content

Commit

Permalink
Updated apt-get install calls
Browse files Browse the repository at this point in the history
  • Loading branch information
petrockblog committed Jun 12, 2014
1 parent 2d1d0d1 commit 0e4b5b3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
14 changes: 7 additions & 7 deletions scriptmodules/emulators.shinc
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ function em_install_cpc4rpi()
function em_install_dosbox()
{
printMsg "Installing Dosbox"
apt-get install -y dosbox
apt-get install -y --force-yes dosbox
}

function em_install_stella()
{
printMsg "Installing Atari 2600 emulator Stella"
apt-get install -y stella
apt-get install -y --force-yes stella
}

function em_install_basiliskII()
Expand Down Expand Up @@ -196,7 +196,7 @@ function em_install_viceC64()
echo 'deb-src http://mirrordirector.raspbian.org/raspbian/ wheezy main contrib non-free rpi' >> /etc/apt/sources.list
apt-get update
#apt-get build-dep -y vice
apt-get install -y libxaw7-dev automake checkinstall
apt-get install -y --force-yes libxaw7-dev automake checkinstall
#apt-get source vice
#cd vice-2.3.dfsg
wget -O vice-2.4.tar.gz http://downloads.sourceforge.net/project/vice-emu/releases/vice-2.4.tar.gz
Expand Down Expand Up @@ -386,7 +386,7 @@ function em_install_hatari()
{
printMsg "Installing Atari emulator Hatari"
apt-get update;
apt-get install -y hatari
apt-get install -y --force-yes hatari
}

function em_configure_mame4allpi()
Expand Down Expand Up @@ -883,7 +883,7 @@ function em_install_rpix86()
function em_install_scummvm()
{
printMsg "Installing ScummVM"
apt-get install -y scummvm scummvm-data
apt-get install -y --force-yes scummvm scummvm-data
if [[ $? -gt 0 ]]; then
__ERRMSGS="$__ERRMSGS Could not successfully install ScummVM."
else
Expand All @@ -895,7 +895,7 @@ function em_install_scummvm()
function em_install_zmachine()
{
printMsg "Installing Z Machine emulator"
apt-get install -y frotz
apt-get install -y --force-yes frotz
wget -U firefox http://www.infocom-if.org/downloads/zork1.zip
wget -U firefox http://www.infocom-if.org/downloads/zork2.zip
wget -U firefox http://www.infocom-if.org/downloads/zork3.zip
Expand Down Expand Up @@ -959,6 +959,6 @@ function em_install_zxspectrumFromSource()
function em_install_zxspectrum()
{
printMsg "Installing ZX Spectrum emulator"
apt-get install -y spectrum-roms fuse-emulator-utils fuse-emulator-common
apt-get install -y --force-yes spectrum-roms fuse-emulator-utils fuse-emulator-common
}

5 changes: 3 additions & 2 deletions scriptmodules/raspbianconfig.shinc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function rc_install_rpiupdate()
# install latest rpi-update script (to enable firmware update)
printMsg "Installing latest rpi-update script"
# make sure that certificates are installed
apt-get install -y ca-certificates
apt-get install -y --force-yes ca-certificates
wget http://goo.gl/1BOfJ -O /usr/bin/rpi-update && chmod +x /usr/bin/rpi-update
}

Expand Down Expand Up @@ -125,7 +125,8 @@ function rc_exportSDLNOMOUSE()
function rc_installAPTPackages()
{
printMsg "Making sure that all needed packaged are installed"
apt-get install -y libsdl1.2-dev screen scons libasound2-dev pkg-config libgtk2.0-dev \
apt-get install -y --force-yes \
libsdl1.2-dev screen scons libasound2-dev pkg-config libgtk2.0-dev \
libboost-filesystem-dev libboost-system-dev zip python-imaging \
libfreeimage-dev libfreetype6-dev libxml2 libxml2-dev libbz2-dev \
libaudiofile-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev \
Expand Down
2 changes: 1 addition & 1 deletion scriptmodules/retropiesetup.shinc
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function rps_checkNeededPackages()
if [[ -z $(type -P git) || -z $(type -P dialog) ]]; then
echo "Did not find needed packages 'git' and/or 'dialog'. I am trying to install these now."
apt-get update
apt-get install -y git dialog
apt-get install -y --force-yes git dialog
if [ $? == '0' ]; then
echo "Successfully installed 'git' and/or 'dialog'."
else
Expand Down
10 changes: 5 additions & 5 deletions scriptmodules/setup.shinc
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function set_configureSAMBA()
clear
printMsg "Installing and configuring SAMBA shares."
apt-get update
apt-get install -y samba samba-common-bin
apt-get install -y --force-yes samba samba-common-bin

set_ensureEntryInSMBConf "AMIGA" "amiga"
set_ensureEntryInSMBConf "APPLE2" "apple2"
Expand Down Expand Up @@ -335,7 +335,7 @@ function set_installGPIOpadModules()

#install dkms and gcc-4.7
apt-get update
apt-get install -y dkms gcc-4.7
apt-get install -y --force-yes dkms gcc-4.7

#reconfigure / install headers (takes a a while)
if [ "$(dpkg-query -W -f='${Version}' linux-headers-$(uname -r))" = "$(uname -r)-2" ]; then
Expand Down Expand Up @@ -502,7 +502,7 @@ function set_install_USBROMService()
printMsg "Installing USB-ROM Service"

# install usbmount package
apt-get install -y usbmount
apt-get install -y --force-yes usbmount

# install hook in usbmount sub-directory
cp $scriptdir/supplementary/01_retropie_copyroms /etc/usbmount/mount.d/
Expand Down Expand Up @@ -580,7 +580,7 @@ function set_installps3controller()
{
clear
apt-get update
apt-get install -y bluez-utils bluez-compat bluez-hcidump checkinstall libusb-dev libbluetooth-dev joystick
apt-get install -y --force-yes bluez-utils bluez-compat bluez-hcidump checkinstall libusb-dev libbluetooth-dev joystick
dialog --backtitle "PetRockBlock.com - RetroPie Setup. Installation folder: $rootdir for user $user" --msgbox "Please make sure that your Bluetooth dongle is connected to the Raspberry Pi and press ENTER." 22 76
if [[ -z `hciconfig | grep BR/EDR` ]]; then
dialog --backtitle "PetRockBlock.com - RetroPie Setup. Installation folder: $rootdir for user $user" --msgbox "Cannot find the Bluetooth dongle. Please try to (re-)connect it and try again." 22 76
Expand Down Expand Up @@ -619,7 +619,7 @@ function set_install_xboxdrv()
{
clear
printMsg "Installing xboxdrv"
apt-get install -y xboxdrv
apt-get install -y --force-yes xboxdrv
if [[ -z `cat /etc/rc.local | grep "xboxdrv"` ]]; then
sed -i -e '13,$ s|exit 0|xboxdrv --daemon --id 0 --led 2 --deadzone 4000 --silent --trigger-as-button --next-controller --id 1 --led 3 --deadzone 4000 --silent --trigger-as-button --dbus disabled --detach-kernel-driver \&\nexit 0|g' /etc/rc.local
fi
Expand Down
4 changes: 2 additions & 2 deletions scriptmodules/supplementary.shinc
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function sup_install_advancemenu()
wget http://downloads.sourceforge.net/project/advancemame/advancemenu/2.5.0/advancemenu-2.5.0.tar.gz
tar xvfz advancemenu-2.5.0.tar.gz -C "$rootdir/supplementary/"

apt-get install -y gcc-4.7
apt-get install -y --force-yes gcc-4.7
export CC=gcc-4.7
export GCC=g++-4.7

Expand Down Expand Up @@ -387,7 +387,7 @@ function sup_install_esconfig()
rm -rf "$rootdir/supplementary/ES-config"
fi
gitPullOrClone "$rootdir/supplementary/ES-config" git://github.com/Aloshi/ES-config.git
sed -i -e "s/apt-get install/apt-get install -y/g" get_dependencies.sh
sed -i -e "s/apt-get install/apt-get install -y --force-yes/g" get_dependencies.sh
./get_dependencies.sh
make
popd
Expand Down

0 comments on commit 0e4b5b3

Please sign in to comment.