adding bdisk-git

This commit is contained in:
brent s 2016-11-21 01:10:18 -05:00
parent 23522feab0
commit 63cd9fea87
7 changed files with 44 additions and 9 deletions

2
.gitmodules vendored
View File

@ -160,4 +160,6 @@
[submodule "python-validators"] [submodule "python-validators"]
url = aur@aur.archlinux.org:bdisk-git url = aur@aur.archlinux.org:bdisk-git
path = python-validators path = python-validators
[submodule "bdisk-git"]
url = aur@aur.archlinux.org:bdisk-git url = aur@aur.archlinux.org:bdisk-git
path = bdisk-git

View File

@ -50,15 +50,16 @@ def gui_init():
"Bazaar (bzr)"] "Bazaar (bzr)"]
vcs_menu = m.menu("What type of VCS system?", vcs_options, "VCS type ('q' to quit):") vcs_menu = m.menu("What type of VCS system?", vcs_options, "VCS type ('q' to quit):")
pkg['name'] = input("\nWhat is the name of your package? (Exclude the '-git' etc. suffix, that will be added automatically later on)\n").lower() pkg['name'] = input("\nWhat is the name of your package? (Exclude the '-git' etc. suffix, that will be added automatically later on)\n").lower()
srcurl = input("\nWhat is the checkout URL for {0}?\n" + srcurl = input(("\nWhat is the checkout URL for {0}?\n" +
"(Do not include the directory or VCS type prefix as per\n" + "(Do not include the directory or VCS type prefix as per\n" +
"https://wiki.archlinux.org/index.php/VCS_package_guidelines#VCS_sources ...\n" + "https://wiki.archlinux.org/index.php/VCS_package_guidelines#VCS_sources ...\n" +
"it will be added automatically)\n".format(pkg['name'])) "it will be added automatically)\n").format(pkg['name']))
pkg['vcstype'] = ["git", pkg['vcstype'] = ["git",
"svn", "svn",
"hg", "hg",
"bzr"] "bzr"]
pkg['srcurl'] = pkg['name'] + "::" + pkg['vcstype'][vcs_menu-1] + srcurl pkg['vcstype'] = pkg['vcstype'][vcs_menu-1]
pkg['srcurl'] = pkg['name'] + "::" + pkg['vcstype'] + '+' + srcurl
pkg['name'] = pkg['name'] + "-" + pkg['vcstype'] pkg['name'] = pkg['name'] + "-" + pkg['vcstype']
pkg['type'] = 'vcs' pkg['type'] = 'vcs'
pkg['srcfile'] = False pkg['srcfile'] = False
@ -186,7 +187,7 @@ def aur_create(pkg):
# and push... # and push...
aur_repo.remotes.origin.push() aur_repo.remotes.origin.push()
# and delete the repo and source file # and delete the repo and source file
shutil.rmtree(repo_dir) #shutil.rmtree(repo_dir)
if pkg['srcfile']: if pkg['srcfile']:
os.remove(pkg['src_dl']) os.remove(pkg['src_dl'])



33
_bin/remove.submodule.sh Executable file
View File

@ -0,0 +1,33 @@
#!/bin/bash

# TODO- incorporate into python script

if [[ -z "${1}" ]];
then
echo "USAGE: ${0} <SUBMODULENAME.TO.REMOVE>"
exit 1
fi

PKG=${1}
PROJPATH='/opt/dev/arch'

cd ${PROJPATH}

# .gitmodules string to match:
#[submodule "bdisk-git"]
# url = aur@aur.archlinux.org:bdisk-git
# path = bdisk-git
sed -i -e "/^[[:space:]]*\[submodule \"${PKG}\"\]$/d" -e "/^[[:space:]]*path[[:space:]]*=[[:space:]]*${PKG}$/d" .gitmodules
git add .gitmodules

# .git/config string to match:
#[submodule "bdisk-git"]
# url = aur@aur.archlinux.org:bdisk-git
sed -i -e "/^[[:space:]]*\[submodule \"${PKG}\"\]$/d" -e "/^[[:space:]]*url[[:space:]]*=[[:space:]]*aur@aur\.archlinux\.org:${PKG}$/d" .git/config

git rm --cached ${PKG}

rm -rf .git/modules/${PKG}

git commit -m "removed ${PKG} submodule"
rm -rf ${PKG}

View File

@ -1,3 +1,2 @@
{% for tpl in pkgbuild_list %} {% for tpl in pkgbuild_list %}{% include tpl %}
{% include tpl %}
{% endfor %} {% endfor %}

View File

@ -10,7 +10,7 @@ pkgbase = {{ pkg['name'] }}
license = {{ license }}{% endfor %}{% if pkg['deps'] is defined and pkg['deps']|length > 0 %}{% for dep in pkg['deps'] %} license = {{ license }}{% endfor %}{% if pkg['deps'] is defined and pkg['deps']|length > 0 %}{% for dep in pkg['deps'] %}
depends = {{ dep }}{% endfor %}{% endif %}{% if pkg['optdeps'] is defined and pkg['optdeps']|length > 0 %}{% for dep in pkg['optdeps'] %} depends = {{ dep }}{% endfor %}{% endif %}{% if pkg['optdeps'] is defined and pkg['optdeps']|length > 0 %}{% for dep in pkg['optdeps'] %}
optdepends = {{ dep }}{% endfor %}{% endif %} optdepends = {{ dep }}{% endfor %}{% endif %}
source = {{ pkg['srcurl'] }}{% if pkg['srcfile'] is defined %} source = {{ pkg['srcurl'] }}{% if pkg['srcfile'] is defined and pkg['srcfile'] != false %}
source = {{ pkg['srcfile'] }}.sig{% endif %} source = {{ pkg['srcfile'] }}.sig{% endif %}
sha512sums = {{ pkg['srchash'] }}{% if pkg['srcfile'] is defined%} sha512sums = {{ pkg['srchash'] }}{% if pkg['srcfile'] is defined%}
sha512sums = SKIP{% endif %} sha512sums = SKIP{% endif %}

View File

@ -1,3 +1,2 @@
{% for tpl in pkgbuild_list %} {% for tpl in pkgbuild_list %}{% include tpl %}
{% include tpl %}
{% endfor %} {% endfor %}

1
bdisk-git Submodule

@ -0,0 +1 @@
Subproject commit fe34edbfc13b8765cde55267477b79aa20a32cec