Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e3bd541f0bdcd5c3573cb6f2056f00571326eb3f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e3bd541f0bdcd5c3573cb6f2056f00571326eb3f)
  • Date: Tue, 5 Jan 2021 21:40:50 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 2 ++
FUNCTIONS | 24 ++++++++----------------
2 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit e3bd541f0bdcd5c3573cb6f2056f00571326eb3f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Add usr/doc & usr/local/doc post-install path fixup

commit a534e919fcbd2f5ec740595b2af31b3d664a82ae
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Simplify post-install path fixup

diff --git a/ChangeLog b/ChangeLog
index fac5528..602eeca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2021-01-05 Ismael Luceno <ismael AT sourcemage.org>
* devel/neko: new spell, The Neko Programming Language
* devel/dune: new spell, A composable build system for OCaml
+ * FUNCTIONS: Simplified path fixup in default_grimoire_post_install
+ Added usr/doc & usr/local/doc post-install path fixup

2021-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* python-pypi/dabo: spell deprecated [replaced by obsolete - dead]
diff --git a/FUNCTIONS b/FUNCTIONS
index 2edf7b3..b93b30c 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -22,28 +22,20 @@ function qt5_cmake_build() {
## This function automatically fixes any known bad paths
#---------------------------------------------------------------------
function default_grimoire_post_install () {
+ local rc=0
real_default_sorcery_post_install && # currently a no-op
if [[ $STAGED_INSTALL == off ]]; then
return 0
fi &&
pushd TRANSL &> /dev/null &&
- if [[ -d usr/man ]]; then
- echo Fixing bad install path: /usr/man &&
- mv -v usr/man usr/share
- fi &&
- if [[ -d usr/info ]]; then
- echo Fixing bad install path: /usr/info &&
- mv -v usr/info usr/share
- fi &&
- if [[ -d usr/local/man ]]; then
- echo Fixing bad install path: /usr/local/man &&
- mv -v usr/local/man usr/share
- fi &&
- if [[ -d usr/local/info ]]; then
- echo Fixing bad install path: /usr/local/info &&
- mv -v usr/local/info usr/share
- fi &&
+ for i in usr{,/local}/{man,info,doc}; do
+ if [[ -d "$i" ]]; then
+ echo "Fixing bad install path: /$i" &&
+ mv -v "$i" usr/share
+ fi || rc=1
+ done
popd &> /dev/null
+ return $rc
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e3bd541f0bdcd5c3573cb6f2056f00571326eb3f), Ismael Luceno, 01/05/2021

Archive powered by MHonArc 2.6.24.

Top of Page