diff options
| author | Holger Paradies <retabell@gmx.de> | 2013-11-11 23:58:53 +0100 |
|---|---|---|
| committer | Holger Paradies <retabell@gmx.de> | 2013-11-12 00:03:49 +0100 |
| commit | 01d0d14f5ee949e34a45811cf1b17178ceecb6a1 (patch) | |
| tree | a075781d5a7809d8cfaa5c86c091768dead419e0 | |
| parent | 7c6bb87f20164979d8f197523e8268d626dcf6db (diff) | |
| download | kanotix-01d0d14f5ee949e34a45811cf1b17178ceecb6a1.zip kanotix-01d0d14f5ee949e34a45811cf1b17178ceecb6a1.tar.gz | |
fix chrome
| -rwxr-xr-x | auto/config | 2 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/00-sources.list | 7 | ||||
| -rw-r--r-- | config/lists/google-chrome | 1 | ||||
| -rw-r--r-- | config/repositories/chrome | 2 | ||||
| -rw-r--r-- | config/repositories/google-chrome | 3 | ||||
| -rw-r--r-- | config/repositories/google-chrome.gpg (renamed from config/repositories/chrome.gpg) | 0 |
6 files changed, 11 insertions, 4 deletions
diff --git a/auto/config b/auto/config index 0c8092c..f169df5 100755 --- a/auto/config +++ b/auto/config @@ -70,7 +70,7 @@ esac grep -wq trinity <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" trinity" grep -wq -e virtualbox -e vbox <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" vbox" grep -wq -e opera <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" opera" -grep -wq chrome <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" chrome" +grep -wq google-chrome <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" google-chrome" grep -wq mesa <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" mesa" grep -wq steam <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" steam steam-wheezy" grep -wq firefox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" firefox-wheezy" diff --git a/config/chroot_local-hooks/00-sources.list b/config/chroot_local-hooks/00-sources.list index 49eaf04..976b539 100755 --- a/config/chroot_local-hooks/00-sources.list +++ b/config/chroot_local-hooks/00-sources.list @@ -1,5 +1,10 @@ #!/bin/sh for file in /root/config/*; do [ -r $file ] && . $file; done -sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list +for x in /etc/apt/sources.list.d/*.list; do + if grep -q '### THIS FILE IS AUTOMATICALLY CONFIGURED ###' $x; then + rm -f $x + fi +done +sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list diff --git a/config/lists/google-chrome b/config/lists/google-chrome new file mode 100644 index 0000000..988464c --- /dev/null +++ b/config/lists/google-chrome @@ -0,0 +1 @@ +google-chrome-stable diff --git a/config/repositories/chrome b/config/repositories/chrome deleted file mode 100644 index 012b0de..0000000 --- a/config/repositories/chrome +++ /dev/null @@ -1,2 +0,0 @@ -# Google Chrome -deb http://dl.google.com/linux/chrome/deb/ stable main diff --git a/config/repositories/google-chrome b/config/repositories/google-chrome new file mode 100644 index 0000000..ab80a74 --- /dev/null +++ b/config/repositories/google-chrome @@ -0,0 +1,3 @@ +### THIS FILE IS AUTOMATICALLY CONFIGURED ### +# You may comment out this entry, but any other modifications may be lost. +deb http://dl.google.com/linux/chrome/deb/ stable main diff --git a/config/repositories/chrome.gpg b/config/repositories/google-chrome.gpg index d304031..d304031 100644 --- a/config/repositories/chrome.gpg +++ b/config/repositories/google-chrome.gpg |