projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverted postgresql upgrade function.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
2b6d3a0
..
9c81fc8
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-271,9
+271,11
@@
Prije prelaska na Debian Etch potrebno je napraviti nadogradnju ovih paketa:
$upgrade
Pokrenite:
$upgrade
Pokrenite:
- 'apt-get dist-upgrade'
+ # apt-get update
+ # apt-get dist-upgrade
ili:
ili:
- 'apt-get install${upgrade}'
+ # apt-get update
+ # apt-get install${upgrade}
Nakon toga ponovno pozovite ovu skriptu."
log "carnet-upgrade aborted, upgrade of$upgrade needed."
Nakon toga ponovno pozovite ovu skriptu."
log "carnet-upgrade aborted, upgrade of$upgrade needed."
@@
-289,7
+291,8
@@
check_apache_version () {
Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
Pokrenite:
Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
Pokrenite:
- 'apt-get install apache2-cn'
+ # apt-get update
+ # apt-get install apache2-cn
Nakon toga ponovno pozovite ovu skriptu."
log "carnet-upgrade aborted, upgrade to apache2-cn needed."
Nakon toga ponovno pozovite ovu skriptu."
log "carnet-upgrade aborted, upgrade to apache2-cn needed."
@@
-310,7
+313,7
@@
upgrade () {
return 1
esac
return 1
esac
- for i in $packages
+ for i in $(echo $packages)
do
pkg $i && to_install="$to_install $i"
done
do
pkg $i && to_install="$to_install $i"
done
@@
-573,7
+576,7
@@
apt_listchanges () {
# make a silent installation of carnet and srce keyrings
install_keyrings () {
pkgadd carnet-keyring srce-keyring
# make a silent installation of carnet and srce keyrings
install_keyrings () {
pkgadd carnet-keyring srce-keyring
- pkgadd dpkg apt debconf
+ pkgadd dpkg apt debconf python-apt
dpkg-reconfigure carnet-keyring srce-keyring
update
dpkg-reconfigure carnet-keyring srce-keyring
update
@@
-616,7
+619,7
@@
upgrade_apache2 () {
fi
done
fi
done
- for package in $packages; do
+ for package in $(echo $packages); do
pkgadd $package
done
}
pkgadd $package
done
}
@@
-669,7
+672,7
@@
upgrade_openldap () {
# fix postgresql deinstallation during upgrade
upgrade_postgresql () {
if check_services show 2>&1 | grep -qw postgresql; then
# fix postgresql deinstallation during upgrade
upgrade_postgresql () {
if check_services show 2>&1 | grep -qw postgresql; then
- pkgadd postgresql
+ apt-get install -y postgresql || apt-get -yf install
fi
}
fi
}