-
Notifications
You must be signed in to change notification settings - Fork 7
Merge branch aptitude-fix #27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ioistired
wants to merge
4
commits into
master
Choose a base branch
from
aptitude-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,14 @@ | ||
| #!/bin/bash | ||
| #!/bin/sh | ||
|
|
||
| ### Simple minded install script for | ||
| ### FreeGeek Chicago by David Eads | ||
| ### Updates by Brent Bandegar, Dee Newcum, James Slater, Alex Hanson | ||
| ### Updates by Brent Bandegar, Dee Newcum, James Slater, Alex Hanson, Benjamin Mintz | ||
|
|
||
| ### Available on FreeGeek` Chicago's github Account at http://git.io/Ool_Aw | ||
| ### Available on FreeGeek Chicago's github Account at http://git.io/Ool_Aw | ||
|
|
||
| ### Import DISTRIB_CODENAME and DISTRIB_RELEASE | ||
| . /etc/lsb-release | ||
|
|
||
| ### Get the integer part of $DISTRIB_RELEASE. Bash/test can't handle floating-point numbers. | ||
| #DISTRIB_MAJOR_RELEASE=$(echo "scale=0; $DISTRIB_RELEASE/1" | bc) # but bc can, using redirections! | ||
|
|
||
|
|
||
| echo "################################" | ||
| echo "# FreeGeek Chicago Installer #" | ||
| echo "################################" | ||
|
|
@@ -38,7 +34,8 @@ ask() { | |
| fi | ||
|
|
||
| # Ask the question | ||
| read -p "$1 [$prompt] " REPLY | ||
| echo -n "$1 [$prompt] " | ||
| read REPLY | ||
|
|
||
| # Default? | ||
| if [ -z "$REPLY" ]; then | ||
|
|
@@ -69,29 +66,6 @@ else | |
| sed -i 's/deb-src /#deb-src# /' /etc/apt/sources.list | ||
| fi | ||
|
|
||
| ### METHOD 1? Add distrib-updates universe multiverse | ||
| # | ||
| # Figure out if this part of the script has been run already | ||
| #grep "${DISTRIB_CODENAME}-updates universe" /etc/apt/sources.list | ||
| #if (($? == 1)); then | ||
| # echo "* Adding ${DISTRIB_CODENAME} updates line for universe and multiverse" | ||
| # cp /etc/apt/sources.list /etc/apt/sources.list.backup | ||
| # echo "deb http://us.archive.ubuntu.com/ubuntu/ ${DISTRIB_CODENAME}-updates universe multiverse" >> /etc/apt/sources.list | ||
| #else | ||
| # echo "# Already added universe and multiverse ${DISTRIB_CODENAME}-updates line to sources," | ||
| #fi | ||
|
|
||
| ### METHOD 2? Add distrib-updates universe multiverse | ||
| # | ||
| # Figure out if this part of the script has been run already | ||
| #if grep -q "${DISTRIB_CODENAME}-updates universe" /etc/apt/sources.list; then | ||
| # echo "# Already added universe and multiverse ${DISTRIB_CODENAME}-updates line to sources," | ||
| #else | ||
| # echo "* Adding ${DISTRIB_CODENAME} updates line for universe and multiverse" | ||
| # cp /etc/apt/sources.list /etc/apt/sources.list.backup | ||
| # echo "deb http://us.archive.ubuntu.com/ubuntu/ ${DISTRIB_CODENAME}-updates universe multiverse" >> /etc/apt/sources.list | ||
| #fi | ||
|
|
||
| ### Disable and Remove Any Medibuntu Repos | ||
| # | ||
|
|
||
|
|
@@ -136,112 +110,103 @@ fi | |
| # We use dist-upgrade to ensure up-to-date kernels are installed | ||
| apt-get -y update && apt-get -y dist-upgrade | ||
|
|
||
| # Each package should have it's own apt-get line. | ||
| # If a package is not found or broken, the whole apt-get line is terminated. | ||
| # Make sure we're using Ubuntu trusty | ||
| if [ $(lsb_release -rs) != '14.04']; then | ||
| echo "Sorry, only Ubuntu 14.04 is supported." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Each package should be on a separate line inside of a heredoc | ||
| # If a package is not found or broken, aptitude continues anyway. | ||
| sudo apt-get -y install aptitude | ||
|
|
||
| ################################### | ||
| ### Packages for Trusty (14.04) ### | ||
| ################################### | ||
|
|
||
| # Add Pepper Flash Player support for Chromium | ||
| # Note that this temporarily downloads Chrome, and the plugin uses plugin APIs not provided in Firefox | ||
| if [ $(lsb_release -rs) = '14.04' ]; then | ||
| echo "* Customizing Trusty packages" | ||
| apt-get -y install pepperflashplugin-nonfree && | ||
| update-pepperflashplugin-nonfree --install | ||
| apt-get -y install fonts-mgopen | ||
|
|
||
| # Kubuntu 14.04 Specific Packages | ||
| if [ $(dpkg-query -W -f='${Status}' kubuntu-desktop 2>/dev/null | grep -c "ok installed") -eq 1 ]; then | ||
| echo "* Customizing Trusty-Kubuntu packages." | ||
| apt-get -y install software-center | ||
| apt-get -y install kdewallpapers | ||
| apt-get -y install kubuntu-restricted-extras | ||
| apt-get -y autoremove muon muon-updater muon-discover | ||
| fi | ||
|
|
||
| # Xubuntu 14.04 Specific Packages | ||
| if [ $(dpkg-query -W -f='${Status}' xubuntu-desktop 2>/dev/null | grep -c "ok installed") -eq 1 ]; then | ||
| echo "* Customizing Trusty-Xubuntu packages." | ||
| apt-get -y install xubuntu-restricted-extras | ||
| apt-get -y remove gnumeric* abiword* | ||
| echo "* Customizing Trusty-Xubuntu settings." | ||
| apt-get -y install xmlstarlet | ||
| # Make a system-wide fix so that Audio CDs autoload correctly. | ||
| xmlstarlet ed -L -u '/channel/property[@name="autoplay-audio-cds"]/property[@name="command"]/@value' -v '/usr/bin/vlc cdda://' /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml | ||
| ### And now do it for the current user. | ||
| xfconf-query -c thunar-volman -p /autoplay-audio-cds/command -s "/usr/bin/vlc cdda://" | ||
|
|
||
| # Make a system-wide fix so that Audio CDs autoload correctly. | ||
| xmlstarlet ed -L -u '/channel/property[@name="autoplay-video-cds"]/property[@name="command"]/@value' -v '/usr/bin/vlc dvd://' /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml | ||
| ### And now do it for the current user. | ||
| xfconf-query -c thunar-volman -p /autoplay-video-cds/command -s "/usr/bin/vlc dvd://" | ||
|
|
||
| # Make a system-wide fix so that Mac eject key (X86Eject) is mapped to eject (eject -r) function. | ||
| xmlstarlet ed -L -s '/channel/property[@name="commands"]/property[@name="default"]' -t elem -n propertyTMP -v "" \ | ||
| -i //propertyTMP -t attr -n "name" -v "X86Eject" \ | ||
| -i //propertyTMP -t attr -n "type" -v "string" \ | ||
| -i //propertyTMP -t attr -n "value" -v "eject" \ | ||
| -r //propertyTMP -v property \ | ||
| /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml | ||
| ### And now do it for the current user. | ||
| xfconf-query -c xfce4-keyboard-shortcuts -p /commands/default/XF86Eject -n -t string -s "eject" | ||
| fi | ||
| echo "* Customizing Trusty packages" | ||
| apt-get -y install pepperflashplugin-nonfree && | ||
| update-pepperflashplugin-nonfree --install | ||
|
|
||
| # Kubuntu 14.04 Specific Packages | ||
| if [ $(dpkg-query -W -f='${Status}' kubuntu-desktop 2>/dev/null | grep -c "ok installed") -eq 1 ]; then | ||
| echo "* Customizing Trusty-Kubuntu packages." | ||
| aptitude -y install <<-EOF | ||
| software-center | ||
| kdewallpapers | ||
| kubuntu-restricted-extras | ||
| EOF | ||
| fi | ||
|
|
||
| ### | ||
| ### Packages for Precise (12.04) ### | ||
| #################################### | ||
|
|
||
| if [ $(lsb_release -rs) = '12.04' ]; then | ||
| echo "* Customizing Precise packages." | ||
| apt-get -y install ttf-mgopen | ||
|
|
||
| # Xubuntu 12.04 Specific Packages | ||
| if [ $(dpkg-query -W -f='${Status}' xubuntu-desktop 2>/dev/null | grep -c "ok installed") -eq 1 ]; then | ||
| echo "* Customizing Precise-Xubuntu packages." | ||
| apt-get -y install xubuntu-restricted-extras | ||
| apt-get -y remove gnumeric* abiword* | ||
| fi | ||
| apt-get -y autoremove muon muon-updater muon-discover | ||
|
|
||
| # Xubuntu 14.04 Specific Packages | ||
| if [ $(dpkg-query -W -f='${Status}' xubuntu-desktop 2>/dev/null | grep -c "ok installed") -eq 1 ]; then | ||
| echo "* Customizing Trusty-Xubuntu packages." | ||
| xubuntu-restricted-extras | ||
| apt-get -y remove gnumeric* abiword* | ||
| echo "* Customizing Trusty-Xubuntu settings." | ||
| xmlstarlet | ||
| # Make a system-wide fix so that Audio CDs autoload correctly. | ||
| xmlstarlet ed -L -u '/channel/property[@name="autoplay-audio-cds"]/property[@name="command"]/@value' -v '/usr/bin/vlc cdda://' /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml | ||
| ### And now do it for the current user. | ||
| xfconf-query -c thunar-volman -p /autoplay-audio-cds/command -s "/usr/bin/vlc cdda://" | ||
|
|
||
| # Make a system-wide fix so that Audio CDs autoload correctly. | ||
| xmlstarlet ed -L -u '/channel/property[@name="autoplay-video-cds"]/property[@name="command"]/@value' -v '/usr/bin/vlc dvd://' /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml | ||
| ### And now do it for the current user. | ||
| xfconf-query -c thunar-volman -p /autoplay-video-cds/command -s "/usr/bin/vlc dvd://" | ||
|
|
||
| # Make a system-wide fix so that Mac eject key (X86Eject) is mapped to eject (eject -r) function. | ||
| xmlstarlet ed -L -s '/channel/property[@name="commands"]/property[@name="default"]' -t elem -n propertyTMP -v "" \ | ||
| -i //propertyTMP -t attr -n "name" -v "X86Eject" \ | ||
| -i //propertyTMP -t attr -n "type" -v "string" \ | ||
| -i //propertyTMP -t attr -n "value" -v "eject" \ | ||
| -r //propertyTMP -v property \ | ||
| /etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml | ||
| ### And now do it for the current user. | ||
| xfconf-query -c xfce4-keyboard-shortcuts -p /commands/default/XF86Eject -n -t string -s "eject" | ||
| fi | ||
|
|
||
|
|
||
| ############### | ||
| ### Packages for All Releases | ||
| ############### | ||
| # Make sure an office suite is installed | ||
| apt-get -y install libreoffice | ||
|
|
||
| # Add codecs / plugins that most people want | ||
| apt-get -y install ubuntu-restricted-extras | ||
| apt-get -y install non-free-codecs | ||
| apt-get -y install libdvdcss2 | ||
|
|
||
| # Add design / graphics programs | ||
| apt-get -y install gimp | ||
| apt-get -y install krita | ||
| apt-get -y install inkscape | ||
|
|
||
| # Add VLC and mplayer to play all multimedia | ||
| apt-get -y install vlc | ||
| apt-get -y install mplayer | ||
| apt-get -y install totem-mozilla | ||
| # Need to justify installation of mplayer and totem-mozilla | ||
|
|
||
| # Misc Packages. Need to justify installation of each. | ||
| apt-get -y install gcj-jre | ||
| apt-get -y install ca-certificates | ||
| apt-get -y install chromium-browser | ||
| # Also install Chrome? | ||
| apt-get -y install hardinfo | ||
|
|
||
| # Add spanish language support | ||
| apt-get -y install language-pack-es | ||
| apt-get -y install language-pack-gnome-es | ||
|
|
||
| # Install nonfree firmware for Broadcom wireless cards and TV capture cards | ||
| apt-get -y install linux-firmware-nonfree firmware-b43-installer b43-fwcutter | ||
|
|
||
| # Using aptitude and a heredoc makes the process TONS faster | ||
| aptitude -y install <<-EOF | ||
| # Make sure an office suite is installed | ||
| libreoffice | ||
|
|
||
| # Add codecs / plugins that most people want | ||
| ubuntu-restricted-extras | ||
| non-free-codecs | ||
| libdvdcss2 | ||
|
|
||
| # Add design / graphics programs | ||
| gimp | ||
| krita | ||
| inkscape | ||
|
|
||
| # Add VLC and mplayer to play all multimedia | ||
| vlc | ||
| mplayer | ||
| totem-mozilla | ||
| # Need to justify installation of mplayer and totem-mozilla | ||
|
|
||
| # Misc Packages. Need to justify installation of each. | ||
| gcj-jre | ||
| ca-certificates | ||
| chromium-browser | ||
| # Also install Chrome? | ||
| hardinfo | ||
|
|
||
| # Add spanish language support | ||
| language-pack-es | ||
| language-pack-gnome-es | ||
|
|
||
| # Install nonfree firmware for Broadcom wireless cards and TV capture cards | ||
| linux-firmware-nonfree firmware-b43-installer b43-fwcutter | ||
|
|
||
| # Install libc6:i386 to fix dependency problems for nyancat:i386 | ||
| libc6:i386 | ||
| EOF | ||
| ################################### | ||
| # Check for Apple as Manufacturer # | ||
| ################################### | ||
|
|
@@ -266,24 +231,16 @@ if [ "$MANUFACTURER" = "Apple Inc." ]; then | |
| fi | ||
|
|
||
| ################################# | ||
| # Install and Run sl or nyancat # | ||
| # Install and Run nyancat # | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nyancat is cool + all, but I think it's going to confuse people who are used to a steam locomotive running across the screen. |
||
| ################################# | ||
| # Ensure installation completed without errors | ||
|
|
||
| apt-get -y install sl | ||
| wget -qO /usr/local/bin/nyancat "https://raw.githubusercontent.com/freegeekchicago/fgc-installscript/master/nyancat" | ||
| chmod 755 /usr/local/bin/nyancat | ||
| if [ -e "/usr/local/bin/nyancat" ] && [ -x "/usr/local/bin/nyancat" ]; then | ||
| # Install the latest nyancat from the utopic (14.10) mirror | ||
| URL='http://archive.ubuntu.com/ubuntu/pool/universe/n/nyancat/nyancat_1.4.4-1_i386.deb'; FILE=`mktemp`; wget "$URL" -qO $FILE && sudo dpkg -i $FILE; rm $FILE | ||
| if [ -e "/usr/bin/nyancat" ]; then | ||
| echo "Installation complete -- relax, and watch this NYAN CAT"; sleep 2 | ||
| /usr/local/bin/nyancat -nsf 37 | ||
| else | ||
| # Using bc instead of test lets us use floating point numbers | ||
| if (( $(bc <<< "$DISTRIB_RELEASE > 10.04") == 1 )); then | ||
| echo "Installation complete -- relax, and watch this STEAM LOCOMOTIVE"; sleep 2 | ||
| /usr/games/sl | ||
| else | ||
| sl | ||
| fi | ||
| # -n: no counter, -s: no titlebar text, -f: run for 34 frames (~3 seconds) | ||
| nyancat -nsf 34 | ||
| fi | ||
|
|
||
| ################## | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like this, but could you port this over to the latest version of the install script? I noticed this PR is a bit over 2 years old now.