[SM-Commit] GIT changes to master =?unknown-8bit?Q?qui?= =?unknown-8bit?Q?ll_by_Andra=C5?= =?unknown-8bit?Q?=BE?= Levstik (4397bb3a5f3993efae51dff2720edcc3d15b6766)

=?unknown-8bit?Q?Andra=C5=BE?= Levstik scm at mail.sourcemage.org
Sat Aug 5 10:42:16 EDT 2006


GIT changes to master quill by Andraž Levstik <ruskie at mages.ath.cx>:

 generate_tarball.sh              |    9 +++++++++
 usr/bin/quill                    |    2 +-
 var/lib/quill/ChangeLog          |    7 +++++++
 var/lib/quill/modules/libcore    |    6 +++---
 var/lib/quill/modules/libdepends |    3 +--
 var/lib/quill/version            |    1 +
 6 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 4397bb3a5f3993efae51dff2720edcc3d15b6766
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    Various pre 0.1 release fixes

diff --git a/generate_tarball.sh b/generate_tarball.sh
new file mode 100755
index 0000000..76829d3
--- /dev/null
+++ b/generate_tarball.sh
@@ -0,0 +1,9 @@
+!#/bin/bash
+CURRENTPWD=$(pwd)
+MY_VERSION=$(cat var/lib/quill/version)
+mkdir ../quill-$MY_VERSION
+cd ..
+cp -r $CURRENTPWD/* quill-$MY_VERSION/
+rm -rf quill-$MY_VERSION/.git quill-$MY_VERSION/usr/bin/quill-old
+tar -jcvf quill-$MY_VERSION.tar.bz2 quill-$MY_VERSION
+gpg --digest-algo SHA512 -u 04E44296 -b quill-$MY_VERSION.tar.bz2
diff --git a/usr/bin/quill b/usr/bin/quill
index c8880f2..526c71f 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -41,7 +41,7 @@ ## @Thanks To all testers
 ## @Contribution abouter, lynxlynxlynx, iuso
 ##
 #---
-QUILL_VERSION="0.1"
+QUILL_VERSION="$(cat /var/lib/quill/version)"
 #---
 ## Some basic stuff that should be loaded and set
 . /etc/sorcery/config
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 469f3e7..f993bb4 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-05 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* libcore: modified the message, added back the need for space delimited
+	           lists
+	* libdepends: fixed some dependency breakage from before
+	* version: added to put version strings in
+	* generate_tarball.sh: to generate a tarball and sign it
+
 2006-08-03 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* quill: addded --version, updated version to 0.1 getting ready for release
 	         added queries for generating tarball and putting spell in grimoire
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 66a4797..448f7bd 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -3,7 +3,7 @@ ## @Synopsis generate basic spell dir
 #---
 function create_spell_base(){
   mkdir -p ${QUILL_SPELL_DIR}/${SPELL_NAME}
-  cd ${SPELL_NAME}
+  cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
   touch DETAILS
   chmod +x DETAILS
   DEPENDSISON=""
@@ -79,8 +79,8 @@ function quill_welcome() {
   message "This makes an immediately useable spell from some minor data."
   message "Does not create a \$SPELL-\$VERSION SOURCE construct but uses real filename"
   message "-----------------------------------------------------------------------------"
-  message "The spell will be put into a grimoire/section you define\(if you choose to\)"
-  message "and a tar.bz2 file will be created in ~/spells ."
+  message "The spell will be put into a grimoire/section you define(if you choose to)"
+  message "and a tar.bz2 file will be created in $QUILL_SPELL_DIR."
   message "-----------------------------------------------------------------------------"
 }
 
diff --git a/var/lib/quill/modules/libdepends b/var/lib/quill/modules/libdepends
index 784d4a3..54c10c2 100644
--- a/var/lib/quill/modules/libdepends
+++ b/var/lib/quill/modules/libdepends
@@ -6,14 +6,13 @@ function query_spell_dependencies() {
   message "${QUERY_COLOR}Please enter the dependencies(non optional) \
 of the spell if any:${DEFAULT_COLOR}"
   read "SPELL_DEPENDENCIES"
-  SPELL_DEPENDENCIES="$(echo $SPELL_DEPENDENCIES | sed -e 's,\W,,g' -e 's/./& /g')"
+  SPELL_DEPENDENCIES=$(tr ',' ' ' <<< "$SPELL_DEPENDENCIES")
 }
 
 function query_spell_optional_dependencies() {
   message "${QUERY_COLOR}Please enter the optional dependencies of the \
 spell if any:${DEFAULT_COLOR}"
   read -a "SPELL_OPTIONAL_DEPENDENCIES"
-  SPELL_OPTIONAL_DEPENDENCIES="$(echo $SPELL_DEPENDENCIES | sed -e 's,\W,,g' -e 's/./& /g')"
 }
 
 function add_dependencies() {
diff --git a/var/lib/quill/version b/var/lib/quill/version
new file mode 100644
index 0000000..49d5957
--- /dev/null
+++ b/var/lib/quill/version
@@ -0,0 +1 @@
+0.1



More information about the SM-Commit mailing list