From f1862bcf2896d5c3610b728948b7188860528b75 Mon Sep 17 00:00:00 2001 From: brent s Date: Tue, 2 Aug 2016 18:15:15 -0400 Subject: [PATCH] ecdsa-tool, nquake --- .gitmodules | 3 +++ _bin/new.package.sh | 19 ++++++++++++++++--- ecdsatool-git | 1 + nquake | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 160000 ecdsatool-git diff --git a/.gitmodules b/.gitmodules index 0a62c4a..558f1e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -133,3 +133,6 @@ [submodule "augeas-git"] path = augeas-git url = aur@aur.archlinux.org:augeas-git +[submodule "ecdsatool-git"] + path = ecdsatool-git + url = aur@aur.archlinux.org:ecdsatool-git diff --git a/_bin/new.package.sh b/_bin/new.package.sh index e7b0719..3f4fbb0 100755 --- a/_bin/new.package.sh +++ b/_bin/new.package.sh @@ -20,12 +20,15 @@ do case ${opt} in "Release/Versioned") PKGTYPE="release" + break ;; "VCS (Git, SVN, Mercurial, etc.)") PKGTYPE="vcs" + break ;; "Quit") exit 0 + break ;; *) echo invalid option;; esac @@ -41,18 +44,23 @@ then case ${opt} in "Git") VCSTYPE='git' + break ;; "Subversion") VCSTYPE='svn' + break ;; "Bazaar") VCSTYPE='bzr' + break ;; "(Other)") VCSTYPE='unknown' + break ;; "Quit") exit 0 + break ;; *) echo invalid option;; esac @@ -98,17 +106,22 @@ fi # Get other bits of info. # PKGDESC -echo -ne "What is a DESCRIPTION of ${_PKGNAME}? (Do not include the package name- e.g.:\n Provides a library for mutating teenage turtles\n) " +echo -ne "What is a DESCRIPTION of ${_PKGNAME}? (Do not include the package name- e.g.:\n Provides a library for mutating teenage turtles\n): " read PKGDESC echo # PKGURL +echo -n "What is the URL for ${_PKGNAME}'s website? " +read PKGURL +echo + +# SRCURL if [[ "${PKGTYPE}" == 'vcs' ]]; then echo -ne "What is the CHECKOUT URL for ${_PKGNAME}?\n(Do not include the directory or VCS type prefix as per https://wiki.archlinux.org/index.php/VCS_package_guidelines#VCS_sources - this is added automatically) e.g.:\n https://github.com/shinnok/johnny.git\nURL: " read SRCURL echo - PKGURL="${_PKGNAME}::${VCSTYPE}+${PKGURL}" + SRCURL="${_PKGNAME}::${VCSTYPE}+${SRCURL}" SRCFILE='' else echo -n "What is the URL to the source tarball for ${PKGNAME} (version ${PKGVER})? " @@ -168,7 +181,7 @@ else touch "${SRCFILE}.sig" fi -for i in MAINTNAME GPGKEY PKGNAME PKGVER PKGDESC SRCURL LICENSE PKGDEPS OPTDEPS BUILDDEPS _PKGNAME SRCFILE; +for i in MAINTNAME GPGKEY PKGNAME PKGVER PKGDESC PKGURL SRCURL LICENSE PKGDEPS OPTDEPS BUILDDEPS _PKGNAME SRCFILE; do NEWVAL=${!i} #echo "${i} is ${NEWVAL}" diff --git a/ecdsatool-git b/ecdsatool-git new file mode 160000 index 0000000..d6f1fea --- /dev/null +++ b/ecdsatool-git @@ -0,0 +1 @@ +Subproject commit d6f1fea9d6672b6681bfc35b9603726065da3458 diff --git a/nquake b/nquake index f13706d..ba90391 160000 --- a/nquake +++ b/nquake @@ -1 +1 @@ -Subproject commit f13706dbd5c2f0cf4afc8f692864955a715a74a4 +Subproject commit ba90391a759cf4faaa4ae6ae123510066d048fd3