New commits:
commit 52f0e99c7830e1c552e0c7a6140fc2a7f3b3802b
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
forgot version
commit 21e7c86b369e5104a49af3eebc41b7716f60839f
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>
adding zip file source dir support, try to detect version of zips and
rpms as well, don't fail if no source file, don't check for source dir
if no source file
diff --git a/install.sh b/install.sh
index 18fa000..4500ed6 100755
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,7 @@ if [[ "$1" == "install" ]]; then
mkdir -vp $INSTALL_ROOT/usr/bin
mkdir -vp $INSTALL_ROOT/usr/share/doc/quill
mkdir -vp $INSTALL_ROOT/var/lib/quill/modules
- cp -r usr var $INSTALL_ROOT/
+ cp -vr usr var $INSTALL_ROOT/
fi
if [[ "$1" == "uninstall" ]]; then
diff --git a/usr/bin/quill b/usr/bin/quill
index 7bf79bc..d550ccd 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -374,18 +374,18 @@ else
if [[ "${BUILDISON}" == "BUILD, " ]]
then
- [[ -e $QUILL_TMP_DIR/${SPELL_SRC_FILE:-uag1au234gaugua} ]] ||
- { error_msg "Bad or missing source: $SPELL_SRC_FILE"; exit 2; }
-
+ if [[ -e $QUILL_TMP_DIR/${SPELL_SRC_FILE:-uag1au234gaugua} ]]
+ then
+ add_build
#message "Quill can try to autodetect the build system the package is
using."
#message "However for this the source tarball needs to be extracted (can
take a while)."
#if query "Do you want quill to try to autodetect the build system?" n
#then
# BS=$(detect_build_system)
# implement_build_system $BS
- #else
+ else
add_build
- #fi
+ fi
fi
if [[ "${INSTALLISON}" == "INSTALL, " ]]
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 2fba39f..10a8a1b 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * quill: don't flunk if missing source file
+ * libcore: non-verbose creation of dir
+ * libdetails: support for grabing version from zips, rpms
+ grab source dir from zip file
+ check if we have the source tarball else skip it
+ * libpre_build: if PRE_BUILD exists copy it over
+ * install.sh: be verbose when installing
+ * version: 0.2.5-rc1
+
2007-04-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: fix name normalisation, original is stored in
QUILL_ORIG_TARGET
* quill: use the non-normalised target for cpan
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 3523a5d..c153c98 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -128,7 +128,7 @@ QUA
exit 0
else
. $QUILL_QUILLRC
- mkdir -vp $QUILL_SPELL_DIR
+ mkdir -p $QUILL_SPELL_DIR
fi
}