Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 19:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

man un-diverting man idempotent

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2018-06-06 10:51:35 +12:00
parent 7c7c2c5b30
commit 664ace2f30
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
livecd-rootfs (2.529~ppa4) cosmic; urgency=medium livecd-rootfs (2.529~ppa6) cosmic; urgency=medium
* Improvements to the ubuntu-base (i.e. Docker) build: * Improvements to the ubuntu-base (i.e. Docker) build:
- Customize the unminimize script to not install ubuntu-minimal. - Customize the unminimize script to not install ubuntu-minimal.

10
live-build/auto/build
View File

@ -115,7 +115,7 @@ echo ""
echo "Reinstallation of packages may fail due to changes to the system" echo "Reinstallation of packages may fail due to changes to the system"
echo "configuration, the presence of third-party packages, or for other" echo "configuration, the presence of third-party packages, or for other"
echo "reasons." echo "reasons."
read -p "Would you like to continue? [y/N]" REPLY read -p "Would you like to continue? [y/N] " REPLY
echo # (optional) move to a new line echo # (optional) move to a new line
if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ]
then then
@ -153,9 +153,11 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp
fi fi
fi fi
# Remove diverted man binary if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
rm -f /usr/bin/man # Remove diverted man binary
dpkg-divert --quiet --remove --rename /usr/bin/man rm -f /usr/bin/man
dpkg-divert --quiet --remove --rename /usr/bin/man
fi
EOF EOF
if [ "$PROJECT" != "ubuntu-base" ]; then if [ "$PROJECT" != "ubuntu-base" ]; then