projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Réglé bug
[hvlinux.git]
/
ubuntu
/
ubuntu-cfg.sh
diff --git
a/ubuntu/ubuntu-cfg.sh
b/ubuntu/ubuntu-cfg.sh
index
f0b9745
..
0dc6504
100755
(executable)
--- a/
ubuntu/ubuntu-cfg.sh
+++ b/
ubuntu/ubuntu-cfg.sh
@@
-20,6
+20,12
@@
ubuntu_cleanup()
${APT} autoclean
}
${APT} autoclean
}
+hv_add_repo()
+{
+ sudo add-apt-repository ${1}
+ ${APT} update
+}
+
if [ "`id -u`" -eq 0 ]; then
echo "You must NOT be the super-user to execute this script"
exit 1
if [ "`id -u`" -eq 0 ]; then
echo "You must NOT be the super-user to execute this script"
exit 1
@@
-70,6
+76,10
@@
if dpkg --list | grep "vinagre" 1> /dev/null 2>&1; then
${APT} remove --purge vinagre
fi
${APT} remove --purge vinagre
fi
+if dpkg --list | grep "modemmanager" 1> /dev/null 2>&1; then
+ ${APT} remove --purge modemmanager
+fi
+
# Braille
if dpkg --list | grep "brltty" 1> /dev/null 2>&1; then
${APT} remove --purge brltty
# Braille
if dpkg --list | grep "brltty" 1> /dev/null 2>&1; then
${APT} remove --purge brltty
@@
-210,6
+220,10
@@
if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
${AGI} dh-make lintian dupload
fi
${AGI} dh-make lintian dupload
fi
+if [ "x${INSTALL_WEB_SERVER}" = "x1" ]; then
+ ${AGI} libapache2-mod-php5
+fi
+
${AGI} abiword gnumeric gnumeric-plugins-extra
${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
${AGI} abiword gnumeric gnumeric-plugins-extra
${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
@@
-246,7
+260,10
@@
if [ ! -h /usr/lib/libdvdcss.so.2 ]; then
fi
${AGI} ffmpeg
${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3
fi
${AGI} ffmpeg
${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3
-${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+${AGI} libavcodec-extra-52
+if [ "x${INSTALL_GNASH}" = "x1" ]; then
+ ${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+fi
if [ -h /dev/cdrom ]; then # Don't install on machines without CD/DVD-ROM
${AGI} vlc mozilla-plugin-vlc
${AGI} sound-juicer
if [ -h /dev/cdrom ]; then # Don't install on machines without CD/DVD-ROM
${AGI} vlc mozilla-plugin-vlc
${AGI} sound-juicer
@@
-275,7
+292,15
@@
if [ -f ${HOME}/.sylpheed-2.0/folderlist.xml ]; then
${HOME}/.sylpheed-2.0/folderlist.xml
fi
${HOME}/.sylpheed-2.0/folderlist.xml
fi
-if [ "x${INSTALL_WMAKER}" = "x1" ]; then
+# Chromium
+hv_add_repo "ppa:chromium-daily/ppa"
+${AGI} chromium-browser
+
+if [ "x${INSTALL_NETBOOK}" = "x1" ]; then
+ ${AGI} battery-status
+ ${AGI} maximus
+ ${AGI} window-picker-applet
+else
${AGI} wmaker
if [ -d ${HOME}/GNUstep/Library/WindowMaker ]; then
cat > ${HOME}/GNUstep/Library/WindowMaker/autostart << "EOF"
${AGI} wmaker
if [ -d ${HOME}/GNUstep/Library/WindowMaker ]; then
cat > ${HOME}/GNUstep/Library/WindowMaker/autostart << "EOF"