summaryrefslogtreecommitdiff
path: root/source/installer
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-08-24 20:48:03 +0000
committerEric Hameleers <alien@slackware.com>2020-08-25 17:59:56 +0200
commit855c3ceaa9f5e68508028608316d973e2068c924 (patch)
tree747e8f2e93aa7e29ad94d74c49cd6b360890f153 /source/installer
parentaef1dd99c7a4d8a3da26619fcbfc4a6eb501d2e3 (diff)
downloadcurrent-855c3ceaa9f5e68508028608316d973e2068c924.tar.gz
Mon Aug 24 20:48:03 UTC 202020200824204803
ap/nano-5.2-x86_64-1.txz: Upgraded. d/doxygen-1.8.20-x86_64-1.txz: Upgraded. d/nasm-2.15.03-x86_64-1.txz: Upgraded. Reverted to previous nasm since the new version has problems with some of the assembly included in Firefox. d/parallel-20200822-noarch-1.txz: Upgraded. l/libcap-ng-0.7.11-x86_64-1.txz: Upgraded. n/libgpg-error-1.39-x86_64-1.txz: Upgraded. n/libqmi-1.26.4-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.2.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/78.2.0/releasenotes/ (* Security fix *) xap/sane-1.0.31-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/installer')
-rw-r--r--source/installer/ChangeLog.txt3
-rwxr-xr-xsource/installer/build_installer.sh7
2 files changed, 8 insertions, 2 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 6ed80164..dffcfeb7 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Thu Aug 20 05:22:35 UTC 2020
+ Include /usr/bin/env.
++--------------------------+
Sun Jul 26 18:30:17 UTC 2020
Add neofetch. Seems like a useful system information tool to have in the
installer, and it's small enough.
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 15700c3d..48268c98 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -660,8 +660,6 @@ fi
chown -R root:root .
# Copy config:
-# If we you rather like bash instead of busybox's ash, you'll need to adjust
-# the symlinks in /bin and stuff.
install -m644 $BUSYBOXCFG .config
# Build:
@@ -683,6 +681,11 @@ rm -f${VERBOSE1} bin/cp
cp --remove-destination -fa${VERBOSE2} * $PKG/$ARCH-installer-filesystem/
+# If we built bin/env, make a link in usr/bin as well:
+if [ -x $PKG/$ARCH-installer-filesystem/bin/env ]; then
+ ( cd $PKG/$ARCH-installer-filesystem/usr/bin ; ln -sf ../../bin/env . )
+fi
+
}