projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release version 6.0.2.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
94db9b0
..
fa0406b
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-500,7
+500,12
@@
install_new () {
create_sources_list () {
local sl sl_new
sl=/etc/apt/sources.list
create_sources_list () {
local sl sl_new
sl=/etc/apt/sources.list
- sl_new=/usr/share/carnet-upgrade/files/etc/apt/sources.list
+ sl_new=$( copy_template $sl )
+
+ # comment aai repository if not in use
+ if ! pkg srce-keyring; then
+ sed -i 's/^\(deb.*ftp.srce.hr\)/#\1/' $sl_new
+ fi
# check if already installed
if ! cmp $sl $sl_new >/dev/null; then
# check if already installed
if ! cmp $sl $sl_new >/dev/null; then
@@
-516,8
+521,9
@@
create_sources_list () {
`cat /etc/apt/sources.list`"
fi
`cat /etc/apt/sources.list`"
fi
-}
+ rm $sl_new
+}
# funkcija koja brise grupu proc
remove_group_proc () {
# funkcija koja brise grupu proc
remove_group_proc () {
@@
-782,9
+788,14
@@
apt_listchanges () {
# make a silent installation of carnet and srce keyrings
install_keyrings () {
# make a silent installation of carnet and srce keyrings
install_keyrings () {
- pkgadd carnet-keyring srce-keyring debian-archive-keyring
+ pkgadd carnet-keyring debian-archive-keyring
+ dpkg-reconfigure carnet-keyring debian-archive-keyring
+
+ if pkg srce-keyring; then
+ pkgadd srce-keyring
+ dpkg-reconfigure srce-keyring
+ fi
- dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
apt_update
}
apt_update
}
@@
-952,8
+963,10
@@
upgrade_munin () {
local config backup hostname domain
# new htmldir location
local config backup hostname domain
# new htmldir location
- mkdir -p /var/cache/munin
- mv /var/www/munin /var/cache/munin/www
+ if [ -d /var/www/munin -a ! -e /var/cache/munin/www ]; then
+ mkdir -p /var/cache/munin
+ mv /var/www/munin /var/cache/munin/www
+ fi
for pkg_name in munin munin-node; do
pkg $pkg_name lt '1.4.5-3' || continue
for pkg_name in munin munin-node; do
pkg $pkg_name lt '1.4.5-3' || continue