Skip to content
Snippets Groups Projects
Commit 416ae9a8 authored by Santiago Rodriguez's avatar Santiago Rodriguez
Browse files

Avoid installing packages and moving files outside path

parent 21dfcbc9
No related branches found
No related tags found
1 merge request!10Bugfix ubuntu release upgrader
...@@ -35,10 +35,6 @@ sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropp ...@@ -35,10 +35,6 @@ sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropp
sed '/nvidia/d' DistUpgrade/build-tarball.sh -i sed '/nvidia/d' DistUpgrade/build-tarball.sh -i
rm tests/test-data/xorg.conf.fglrx rm tests/test-data/xorg.conf.fglrx
#% Make sure nvidia-common and fglrx-modaliases are not installed
apt-get remove --purge -y nvidia-common || true
apt-get remove --purge -y fglrx-modaliases || true
#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740 #https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
cat << EOF >> DistUpgrade/DistUpgradeQuirks.py cat << EOF >> DistUpgrade/DistUpgradeQuirks.py
...@@ -195,7 +191,6 @@ EOF ...@@ -195,7 +191,6 @@ EOF
rm DistUpgrade/EOLReleaseAnnouncement.html DistUpgrade/ReleaseAnnouncement.html rm DistUpgrade/EOLReleaseAnnouncement.html DistUpgrade/ReleaseAnnouncement.html
apt-get install -q -y parsewiki
parsewiki DistUpgrade/EOLReleaseAnnouncement > DistUpgrade/EOLReleaseAnnouncement.html parsewiki DistUpgrade/EOLReleaseAnnouncement > DistUpgrade/EOLReleaseAnnouncement.html
parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnouncement.html parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnouncement.html
...@@ -267,7 +262,6 @@ replace changelogs.ubuntu.com packages.trisquel.info . ...@@ -267,7 +262,6 @@ replace changelogs.ubuntu.com packages.trisquel.info .
/bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$') /bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$')
apt-get install --force-yes -y rpl
rpl 11\.04 5\.0 DistUpgrade/*.ui rpl 11\.04 5\.0 DistUpgrade/*.ui
rpl 11\.04 5\.0 po/* -R rpl 11\.04 5\.0 po/* -R
rpl 11\.10 5\.5 DistUpgrade/*.ui rpl 11\.10 5\.5 DistUpgrade/*.ui
...@@ -327,4 +321,3 @@ changelog "Compiled for Trisquel" ...@@ -327,4 +321,3 @@ changelog "Compiled for Trisquel"
PARALLEL=false compile PARALLEL=false compile
cp ../dist-upgrader* /root
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment