Skip to Content.
Sympa Menu

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

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 sorcery by Ismael Luceno (b538c2da085b67c1a042bd8cafa466011ffcfb55)
  • Date: Tue, 15 Mar 2022 00:02:30 +0000

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

usr/sbin/scribe | 14 +++++++++-----
var/lib/sorcery/modules/build_api/api2 | 20 +++++---------------
2 files changed, 14 insertions(+), 20 deletions(-)

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

scribe: Fix updating from tarballs

Fixes: 878079e1d3d4 ("scribe: don't download/clone all over again when
updating")

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

api2: Simplify calls to delve

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

Simplify run_install initial message

diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index f0197ed..59a4dbd 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -281,11 +281,15 @@ scribe_add_update_worker() {

# download it
local scribe_target scribe_type
- if [[ $add_or_update == update ]]; then
- url_download "$grim_name" "$from" "" scribe_target scribe_type
- else
- url_download "$grim_target" "$from" "" scribe_target scribe_type
- fi
+ case "$add_or_update:$from" in
+ # Special case to avoid re-downloading git repos
+ (update:git*)
+ url_download "$grim_name" "$from" "" scribe_target scribe_type
+ ;;
+ (*)
+ url_download "$grim_target" "$from" "" scribe_target scribe_type
+ ;;
+ esac

#check the success of the download
if [ $? != 0 ]; then
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index b24bdaf..a2212a4 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -85,13 +85,8 @@ run_build_spell() {
then
invoke_installwatch
fi &&
- if [[ $OVERRIDE_GRIMOIRES ]]; then
- delve -g "$OVERRIDE_GRIMOIRES" $SPELL INSTALL &&
- delve -g "$OVERRIDE_GRIMOIRES" $SPELL INSTALL_EXTRAS
- else
- delve $SPELL INSTALL &&
- delve $SPELL INSTALL_EXTRAS
- fi &&
+ delve ${OVERRIDE_GRIMOIRES+-g "$OVERRIDE_GRIMOIRES"} $SPELL INSTALL &&
+ delve ${OVERRIDE_GRIMOIRES+-g "$OVERRIDE_GRIMOIRES"} $SPELL
INSTALL_EXTRAS &&
run_post_install || return 2
run_transfer &&
devoke_installwatch &&
@@ -211,14 +206,9 @@ run_pre_install() {
run_install() {
debug "build_api2" "Starting run_install()"

- if [[ $STAGED_INSTALL == on ]]; then
- message "${MESSAGE_COLOR}Installing" \
- "${SPELL_COLOR}${SPELL}${MESSAGE_COLOR}" \
- "into the stage${DEFAULT_COLOR}" >&3
- else
- message "${MESSAGE_COLOR}Installing" \
- "${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" >&3
- fi
+ message "${MESSAGE_COLOR}Installing" \
+ "${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" \
+ "(staging: $STAGED_INSTALL)" >&3

if [ -f $S_PWD ] ; then
cd "$(cat $S_PWD)"



  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (b538c2da085b67c1a042bd8cafa466011ffcfb55), Ismael Luceno, 03/14/2022

Archive powered by MHonArc 2.6.24.

Top of Page