Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (4974342efe5b77271814d233a5f6462a6b122b87)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (4974342efe5b77271814d233a5f6462a6b122b87)
  • Date: Mon, 30 Sep 2024 00:59:59 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

shell-term-fm/bash/BUILD | 24 +++++++++++++
shell-term-fm/bash/DETAILS | 1
shell-term-fm/bash/HISTORY | 4 ++
shell-term-fm/bash/INSTALL | 79
+++++++++++++++++----------------------------
4 files changed, 58 insertions(+), 50 deletions(-)

New commits:
commit 4974342efe5b77271814d233a5f6462a6b122b87
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

shell-term-fm/bash: reorganized binaries installation,
enabled STAGGED_INSTALL

diff --git a/shell-term-fm/bash/BUILD b/shell-term-fm/bash/BUILD
index 870ca3a..bf9a2f4 100755
--- a/shell-term-fm/bash/BUILD
+++ b/shell-term-fm/bash/BUILD
@@ -25,4 +25,26 @@ make clean &&
--infodir=${TRACK_ROOT}/usr/share/info \
--with-bash_malloc=no \
$OPTS &&
-make DESTDIR=$INSTALL_ROOT
+make DESTDIR=$INSTALL_ROOT &&
+
+mkdir -p "${SOURCE_DIRECTORY}/INSTALL_ROOT" &&
+
+make_normal &&
+#
+# If bash is installed on a system without /bin then /bin will be just a file
+# instead of a directory
+# Bash is the first package installed by baseystem that writes to /bin
+#
+install -d -m 755 -o root -g root ./INSTALL_ROOT/bin &&
+
+cp -f bash ./INSTALL_ROOT/bin &&
+cp -f bashbug ./INSTALL_ROOT/bin &&
+ln -sf bash ./INSTALL_ROOT/bin/sh &&
+
+# install static bash
+install -D -m 755 bash.static "./NSTALL_ROOT/sbin/bash.static" &&
+# compatibility with older bash spell
+ln -fns ../sbin/bash.static "./INSTALL_ROOT/bin/bash.static" &&
+
+# create restricted shell
+ln -fns bash ./INSTALL_ROOT/bin/rbash
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index 9e47018..9bbf84f 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -29,7 +29,6 @@ for ((i=5; i<=2*BASH_PATCHLEVEL + 3; i+=2)); do
SOURCE$((i+1))_IGNORE=signature"
done
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
- STAGED_INSTALL=off
ENTERED=20010922
LICENSE[0]=GPL2
KEYWORDS="console"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 2b603b8..6d7d051 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2024-09-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: enabled STAGED_INSTALL
+ * BUILD, INSTALL: reorganized installation of binaries, quoting++
+
2024-09-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 5.2.37

diff --git a/shell-term-fm/bash/INSTALL b/shell-term-fm/bash/INSTALL
index aecd53c..92f6f25 100755
--- a/shell-term-fm/bash/INSTALL
+++ b/shell-term-fm/bash/INSTALL
@@ -1,35 +1,18 @@
-make_normal &&
-#
-# If bash is installed on a system without /bin then /bin will be just a file
-# instead of a directory
-# Bash is the first package installed by baseystem that writes to /bin
-#
-install -d -m 755 -o root -g root ${INSTALL_ROOT}/bin &&
-
-cp -f bash ${INSTALL_ROOT}/bin &&
-cp -f bashbug ${INSTALL_ROOT}/bin &&
-ln -sf bash ${INSTALL_ROOT}/bin/sh &&
-
-# install static bash
-install -D -m 755 bash.static "$INSTALL_ROOT/sbin/bash.static" &&
-# compatibility with older bash spell
-ln -fns ../sbin/bash.static "$INSTALL_ROOT/bin/bash.static" &&
-
-# create restricted shell
-ln -fns bash $INSTALL_ROOT/bin/rbash &&
+cd INSTALL_ROOT &&
+find . | cpio --pass-through --make-directories --verbose "${INSTALL_ROOT}/"
&&

-cd doc &&
+cd "${SOURCE_DIRECTORY}/doc" &&

-mkdir -p ${INSTALL_ROOT}/usr/share/man/man1 &&
+mkdir -p "${INSTALL_ROOT}/usr/share/man/man1" &&
for MANPAGE in `ls *.1`; do
- gzip -9 $MANPAGE &&
- cp $MANPAGE.gz ${INSTALL_ROOT}/usr/share/man/man1
+ gzip -9 "${MANPAGE}" &&
+ cp "${MANPAGE}.gz" "${INSTALL_ROOT}/usr/share/man/man1"
done &&

if spell_ok texinfo; then
- cp bashref.info ${INSTALL_ROOT}/usr/share/info/bash.info &&
- install-info --info-dir=${INSTALL_ROOT}/usr/share/info \
- ${INSTALL_ROOT}/usr/share/info/bash.info
+ cp bashref.info "${INSTALL_ROOT}/usr/share/info/bash.info" &&
+ install-info --info-dir="${INSTALL_ROOT}/usr/share/info" \
+ "${INSTALL_ROOT}/usr/share/info/bash.info"
fi &&

#
@@ -40,53 +23,53 @@ fi &&
# Install etc/profile.d scripts
#
for i in dummy lc.sh; do
- if install_config_file $SCRIPT_DIRECTORY/profile.d/$i \
- $INSTALL_ROOT/etc/profile.d/$i; then
- chmod 0755 $INSTALL_ROOT/etc/profile.d/$i
+ if install_config_file "${SCRIPT_DIRECTORY}/profile.d/$i" \
+ "${INSTALL_ROOT}/etc/profile.d/$i"; then
+ chmod 0755 "${INSTALL_ROOT}/etc/profile.d/$i"
fi
done &&

#Install configuration file for the lc.sh script
-install_config_file $SCRIPT_DIRECTORY/profile.d/locale.conf \
- $INSTALL_ROOT/etc/sysconfig/locale &&
+install_config_file "${SCRIPT_DIRECTORY}/profile.d/locale.conf" \
+ "${INSTALL_ROOT}/etc/sysconfig/locale" &&

-if install_config_file $SCRIPT_DIRECTORY/profile \
- $INSTALL_ROOT/etc/profile; then
- chmod 0755 $INSTALL_ROOT/etc/profile
+if install_config_file "${SCRIPT_DIRECTORY}/profile" \
+ "${INSTALL_ROOT}/etc/profile"; then
+ chmod 0755 "${INSTALL_ROOT}/etc/profile"
fi &&

#
# Bug #9672
#
-if install_config_file $SCRIPT_DIRECTORY/bashrc \
- $INSTALL_ROOT/etc/bashrc; then
- chmod 0755 $INSTALL_ROOT/etc/bashrc
+if install_config_file "${SCRIPT_DIRECTORY}/bashrc" \
+ "${INSTALL_ROOT}/etc/bashrc"; then
+ chmod 0755 "${INSTALL_ROOT}/etc/bashrc"
fi &&

#
# Bug #9673
#
-if install_config_file $SCRIPT_DIRECTORY/skel/bash_profile \
- $INSTALL_ROOT/etc/skel/.bash_profile; then
- chmod 0755 $INSTALL_ROOT/etc/skel/.bash_profile
+if install_config_file "${SCRIPT_DIRECTORY}/skel/bash_profile" \
+ "${INSTALL_ROOT}/etc/skel/.bash_profile"; then
+ chmod 0755 "${INSTALL_ROOT}/etc/skel/.bash_profile"
fi &&

#
# Bug #9626
# bashrc should not symlink to bash_profile
#
-if [ -h $INSTALL_ROOT/etc/skel/.bashrc ]; then
- rm -f $INSTALL_ROOT/etc/skel/.bashrc
+if [ -h "${TRACK_ROOT}/etc/skel/.bashrc" ]; then
+ rm -f "${TRACK_ROOT}/etc/skel/.bashrc"
fi &&

-if install_config_file $SCRIPT_DIRECTORY/skel/bashrc \
- $INSTALL_ROOT/etc/skel/.bashrc; then
- chmod 0755 $INSTALL_ROOT/etc/skel/.bashrc
+if install_config_file "${SCRIPT_DIRECTORY}/skel/bashrc" \
+ "${INSTALL_ROOT}/etc/skel/.bashrc"; then
+ chmod 0755 "${INSTALL_ROOT}/etc/skel/.bashrc"
fi &&

-if install_config_file $SCRIPT_DIRECTORY/skel/bash_logout \
- $INSTALL_ROOT/etc/skel/.bash_logout; then
- chmod 0755 $INSTALL_ROOT/etc/skel/.bash_logout
+if install_config_file "${SCRIPT_DIRECTORY}/skel/bash_logout" \
+ "${INSTALL_ROOT}/etc/skel/.bash_logout"; then
+ chmod 0755 "${INSTALL_ROOT}/etc/skel/.bash_logout"
fi

#


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (4974342efe5b77271814d233a5f6462a6b122b87), Pavel Vinogradov, 09/29/2024

Archive powered by MHonArc 2.6.24.

Top of Page