summaryrefslogtreecommitdiff
path: root/hacking
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2016-12-09 12:42:29 -0500
committerGitHub <noreply@github.com>2016-12-09 12:42:29 -0500
commitbea8a3201d79880ed18f062c7811d37237741619 (patch)
tree433ec966af81c66f9c20853cb7354a86d4573925 /hacking
parent0b7764d572f5dc621854f919fa5294872b7736b9 (diff)
downloadansible-bea8a3201d79880ed18f062c7811d37237741619.tar.gz
Remove obsolete files and instructions. (#19079)
* Remove obsolete `unify_repos.sh` script. * Remove submodule update after checkout reference.
Diffstat (limited to 'hacking')
-rwxr-xr-xhacking/unify_repos.sh57
1 files changed, 0 insertions, 57 deletions
diff --git a/hacking/unify_repos.sh b/hacking/unify_repos.sh
deleted file mode 100755
index d4c7ecbaae..0000000000
--- a/hacking/unify_repos.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-set -u
-
-# get current stuff
-git clone https://github.com/ansible/ansible.git ansible_unified
-cd ansible_unified/
-git submodule init
-git submodule update
-git remote add upstream git@github.com:ansible/ansible.git
-
-# add submodules as remotes
-git remote add core_modules https://github.com/ansible/ansible-modules-core.git
-git remote add extras_modules https://github.com/ansible/ansible-modules-extras.git
-git fetch --all
-
-# remove submodules
-echo "" > .gitmodules
-git add .gitmodules
-git rm --cached lib/ansible/modules/core/
-git rm --cached lib/ansible/modules/extras/
-git commit -am "removed core and extras submodules"
-rm -rf lib/ansible/modules/core
-rm -rf lib/ansible/modules/extras
-
-# merge remotes into old submodule dirs
-## core
-git merge -s ours --allow-unrelated-histories --no-commit core_modules/devel
-git read-tree --prefix=lib/ansible/modules/core -u core_modules/devel
-git commit -am 'core modules back to main repo'
-## extras
-git merge -s ours --allow-unrelated-histories --no-commit extras_modules/devel
-git read-tree --prefix=lib/ansible/modules/extras -u extras_modules/devel
-git commit -am 'extras modules back to main repo'
-
-for subdir in core extras
-do
- # unify directories
- for mydir in $(find lib/ansible/modules/${subdir} -type d)
- do
- mkdir -p ${mydir/$subdir\//}
- done
-
- # move plugins
- for myfile in $(find lib/ansible/modules/${subdir} -type f)
- do
- if [ -e ${myfile/$subdir\///} ]; then #mostly to avoid __init__.py clobering
- echo "skipping ${myfile} as it already exists in destination"
- else
- git mv ${myfile} ${myfile/$subdir\//}
- fi
- done
-
- rm -rf lib/ansible/modules/${subdir}
-done