nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'maco/master'

Browse source 
Conflicts:
	script/ubuntu-setup.bash
This commit is contained in:
Raphael 2010-10-07 15:10:42 -07:00
commit e5e812f0d5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
script/ubuntu-setup.bash
View file

@ -23,10 +23,11 @@ We need to do some actions as an ordinary user. We use sudo where necessary." &&
# Check if the user has sudo privileges. # Check if the user has sudo privileges.
sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; } sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; }
# Check if universal repository is enabled # Check if universal repository is enabled
grep -i universe /etc/apt/sources.list > /dev/null || \ grep -ie '^deb .*universe' /etc/apt/sources.list > /dev/null || \
{ echo "Please enable universe repository" ; exit 1 ; } { echo "Please enable universe repository" ; exit 1 ; }
# Make sure that we only install the latest version of packages # Make sure that we only install the latest version of packages
sudo apt-get update sudo apt-get update