-add_history
+ if [[ "${BUILD_DTFILE}" != "" ]]
+ then
+ add_desktop_file
+ fi
+ add_history
+fi
cd ${CURRENTPWD}
-
#---
##
## This software is free software; you can redistribute it and/or modify
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index dbd6796..dd6b616 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,25 @@
+2006-07-25 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * quill:updated copyright date, adde 2 more contributors,
+ added new variable QUILL_VERSION, new mode --reconfigure,
+ enabled some more queries: pre_build, prepare, conflicts
+ * libbuild:added GPL footer
+ * libconfigure:added GPL footer
+ * libconflicts:added GPL footer
+ * libcore:wget should try -c, new configure vairable, cut away some
of the
+ welcome msg, added some defaults for $EDITOR, copy to the
dir
+ added don't assume it's in /var
+ * libdepends:make it possible to use almost any delimiter in a
dependencies
+ list, added GPL footer
+ * libdesktop:added GPL footer, new ToDo entry
+ * libdetails:added GPL footer
+ * libfreshmeatxml:added GPL footer
+ * libhistory:added GPL footer
+ * libinstall:added GPL footer
+ * libpre_build:added all te necesary functions and the GPL footer
+ * libprepare:added synopsis and GPL footer
+ * libprovides:ugh big mistake this isn't triggers it's provides and
they
+ should be all upcase and added GPL footer
+
2006-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libfreshmeatxml: add check for non-exsisting projects; fix
indentation
-
2006-07-16 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* var/lib/quill/modules/libdetails: change for global BUILD_API2
and remove ENETRED and UPDATED
diff --git a/var/lib/quill/modules/libbuild b/var/lib/quill/modules/libbuild
index 1f3d0b2..dadeb11 100644
--- a/var/lib/quill/modules/libbuild
+++ b/var/lib/quill/modules/libbuild
@@ -29,3 +29,20 @@ function add_build() {
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
diff --git a/var/lib/quill/modules/libconfigure
b/var/lib/quill/modules/libconfigure
index e69de29..5c54521 100644
--- a/var/lib/quill/modules/libconfigure
+++ b/var/lib/quill/modules/libconfigure
@@ -0,0 +1,18 @@
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libconflicts
b/var/lib/quill/modules/libconflicts
index b328343..07f0ffe 100644
--- a/var/lib/quill/modules/libconflicts
+++ b/var/lib/quill/modules/libconflicts
@@ -22,3 +22,20 @@ then
done
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 2645362..c3c129e 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -16,7 +16,7 @@ #---
function download_spell_source(){
cd ${QUILL_TMP_DIR}
- wget "${SPELL_SRC_URL}"
+ wget -c "${SPELL_SRC_URL}"
cd ${CURRENTPWD}
cd ${SPELL_NAME}
}
@@ -53,18 +53,21 @@ function quill_rc() {
message "${PROBLEM_COLOR}Ugghhh... something went
wrong...${DEFAULT_COLOR}"
fi
fi
- if [[ -f ${QUILL_QUILLRC} ]]
+ if [[ ! -f ${QUILL_QUILLRC} ]] ||
+ [[ $QUILL_MODE == reconfigure ]]
then
- . ${QUILL_QUILLRC}
- else
touch ${QUILL_QUILLRC}
message "${PROBLEM_COLOR}This will create a ${QUILL_QUILLRC} file for
you${DEFAULT_COLOR}"
message "${QUERY_COLOR}Please enter your name for the HISTORY
entry.${DEFAULT_COLOR}"
read "GURU_NAME"
message "${QUERY_COLOR}Please enter your email for the HISTORY
entry.${DEFAULT_COLOR}"
read "GURU_EMAIL"
+ message "${QUERY_COLOR}Where do you want to store generated
spells(absolute path).${DEFAULT_COLOR}"
+ read "QUILL_SPELL_DIR"
message "Thank you. Now generating ${QUILL_QUILLRC}"
- echo -e "GURU_NAME=\"${GURU_NAME}\"\n""GURU_EMAIL=\"${GURU_EMAIL}\"" >
${QUILL_QUILLRC}
+ echo -e
"QUILL_VERSION=\"${QUILL_VERSION}\"\nGURU_NAME=\"${GURU_NAME}\"\nGURU_EMAIL=\"${GURU_EMAIL}\"\nQUILL_SPELL_DIR=\"${QUILL_SPELL_DIR}\""
> ${QUILL_QUILLRC}
+ else
+ . ${QUILL_QUILLRC}
fi
}
@@ -79,20 +82,17 @@ function quill_welcome() {
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
"-----------------------------------------------------------------------------"
- message "${PROBLEM_COLOR}Any lists i.e. dependencies and optional
dependencies should be"
- message "space delimited and not comma delimited!!!${DEFAULT_COLOR}"
- message
"-----------------------------------------------------------------------------"
}
#---
## @Synopsis used to edit spell files
#---
function quill_edit() {
- message "Now invoking $EDITOR to edit spell files."
+ message "Now invoking ${EDITOR:-nano} to edit spell files."
cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
for SPELL_FILE in .
do
- $EDITOR ${SPELL_FILE}
+ ${EDITOR:-nano} ${SPELL_FILE}
done
message "All modifications complete."
}
@@ -126,7 +126,7 @@ function quill_final_put_in_grimoire() {
read QUILL_SECT_NAME
message "Now scribling spell into
${QUILL_GRIM_NAME}/${QUILL_SECT_NAME}/${QUILL_SPELL_NAME}"
cd ${QUILL_SPELL_DIR}/${QUILL_SPELL_NAME}
- cp -r ${SPELL_NAME}
/var/lib/sorcery/codex/${QUILL_GRIM_NAME}/${QUILL_SECT_NAME}/
+ cp -r ${SPELL_NAME} ${QUILL_GRIM_NAME}/${QUILL_SECT_NAME}/
if $? != 0 ; then
message "Scribling failed"
else
diff --git a/var/lib/quill/modules/libdepends
b/var/lib/quill/modules/libdepends
index d6fffc7..784d4a3 100644
--- a/var/lib/quill/modules/libdepends
+++ b/var/lib/quill/modules/libdepends
@@ -6,12 +6,14 @@ 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')"
}
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() {
@@ -55,3 +57,21 @@ echo "optional_depends \"${SPELL_OPTIONA
# "optional_depends ${j} \"enabled-option\" \"disabled-option\"
\"description\""
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libdesktop
b/var/lib/quill/modules/libdesktop
index 8f348f7..fa71ba2 100644
--- a/var/lib/quill/modules/libdesktop
+++ b/var/lib/quill/modules/libdesktop
@@ -41,3 +41,21 @@ then
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libdetails
b/var/lib/quill/modules/libdetails
index 40c7939..1a7d4f7 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -219,3 +219,20 @@ rm ${QUILL_TMP_DIR}/$SPELL_NAME
message "Done..."
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
diff --git a/var/lib/quill/modules/libfreshmeatxml
b/var/lib/quill/modules/libfreshmeatxml
index 66cb02a..e7ffedc 100644
--- a/var/lib/quill/modules/libfreshmeatxml
+++ b/var/lib/quill/modules/libfreshmeatxml
@@ -1,4 +1,3 @@
-#set -x
#---
## @Synopsis libfreshmeatxml
#---
@@ -72,3 +71,21 @@ function quill_fmxml_core(){
quill_fmxml_grab_from_xml desc_full $1 |fmt >
${QUILL_TMP_DIR}/${SPELL_NAME}
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libhistory
b/var/lib/quill/modules/libhistory
index 2b0cc80..a9c9dc6 100644
--- a/var/lib/quill/modules/libhistory
+++ b/var/lib/quill/modules/libhistory
@@ -1,3 +1,7 @@
+#---
+## @Synopsis libhistory
+#---
+
function add_history()
{
message "Generating HISTORY file..."
@@ -9,3 +13,21 @@ echo \
message "Done..."
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libinstall
b/var/lib/quill/modules/libinstall
index fc57781..1dffcd7 100644
--- a/var/lib/quill/modules/libinstall
+++ b/var/lib/quill/modules/libinstall
@@ -1,3 +1,7 @@
+#---
+## @Synopsis libinstall
+#---
+
INSTALLISON=""
function add_install()
@@ -23,3 +27,21 @@ then
INSTALLISON="INSTALL, "
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libpre_build
b/var/lib/quill/modules/libpre_build
index e69de29..662a499 100644
--- a/var/lib/quill/modules/libpre_build
+++ b/var/lib/quill/modules/libpre_build
@@ -0,0 +1,44 @@
+#---
+## @Synopsis libpre_build
+#---
+
+PREBUILDISON=""
+
+function query_spell_pre_build()
+{
+ if query "Will you be adding a custom PRE_BUILD file:" "n"
+ then
+ PREBUILDISON="PRE_BUILD, "
+ fi
+}
+
+function add_pre_build()
+{
+ touch PRE_BUILD
+ chmod +x PRE_BUILD
+ if query "Do you want the default_pre_build function dumped into the
PRE_BUILD file" "n"
+ then
+ (declare -f real_default_pre_build | tail -n -2 | head -n 1 | sed
"s:&&:\&\&\n:g") > PRE_BUILD
+ else
+ echo "default_pre_build" > PRE_BUILD
+ fi
+ ${EDITOR:-nano} PRE_BUILD
+}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libprepare
b/var/lib/quill/modules/libprepare
index 1ca6f88..344379a 100644
--- a/var/lib/quill/modules/libprepare
+++ b/var/lib/quill/modules/libprepare
@@ -1,3 +1,7 @@
+#---
+## @Synopsis libprepare
+#---
+
function query_spell_prepare()
{
if query "Will you be adding a PREPARE file:" "n"
@@ -15,3 +19,21 @@ then
${EDITOR:-nano} PREPARE
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
diff --git a/var/lib/quill/modules/libprovides
b/var/lib/quill/modules/libprovides
index 391c397..abbb889 100644
--- a/var/lib/quill/modules/libprovides
+++ b/var/lib/quill/modules/libprovides
@@ -10,14 +10,32 @@ function query_spell_provides() {
read "SPELL_PROVIDES"
}
-function add_triggers() {
+function add_provides() {
if [[ "${SPELL_PROVIDES}" != "" ]]
then
touch PROVIDES
PROVIDESISON="PROVIDES, "
for n in ${SPELL_PROVIDES}
do
- echo "${n}" >> PROVIDES
+ echo "${n}" | tr "a-z" "A-Z" >> PROVIDES
done
fi
}
+#---
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---
+
[SM-Commit] GIT changes to master quill by Andra?? Levstik (6d34e003e896df7662198a002b9353665582a91e),
Andra?? Levstik, 07/25/2006