use code.0x2620.org instead of git.0x2620.org

This commit is contained in:
j 2024-06-01 10:37:27 +01:00
parent cf0ad718f7
commit 27d64f2ad5
3 changed files with 10 additions and 10 deletions

6
ctl
View file

@ -27,16 +27,16 @@ if [ "$action" = "init" ]; then
$SUDO bin/python3 -m pip install -U --ignore-installed "pip<9" $SUDO bin/python3 -m pip install -U --ignore-installed "pip<9"
fi fi
if [ ! -d static/oxjs ]; then if [ ! -d static/oxjs ]; then
$SUDO git clone -b $branch https://git.0x2620.org/oxjs.git static/oxjs $SUDO git clone -b $branch https://code.0x2620.org/0x2620/oxjs.git static/oxjs
fi fi
$SUDO mkdir -p src $SUDO mkdir -p src
if [ ! -d src/oxtimelines ]; then if [ ! -d src/oxtimelines ]; then
$SUDO git clone -b $branch https://git.0x2620.org/oxtimelines.git src/oxtimelines $SUDO git clone -b $branch https://code.0x2620.org/0x2620/oxtimelines.git src/oxtimelines
fi fi
for package in oxtimelines python-ox; do for package in oxtimelines python-ox; do
cd ${BASE} cd ${BASE}
if [ ! -d src/${package} ]; then if [ ! -d src/${package} ]; then
$SUDO git clone -b $branch https://git.0x2620.org/${package}.git src/${package} $SUDO git clone -b $branch https://code.0x2620.org/0x2620/${package}.git src/${package}
fi fi
cd ${BASE}/src/${package} cd ${BASE}/src/${package}

View file

@ -13,19 +13,19 @@ from os.path import join, exists
repos = { repos = {
"pandora": { "pandora": {
"url": "https://git.0x2620.org/pandora.git", "url": "https://code.0x2620.org/0x2620/pandora.git",
"path": ".", "path": ".",
}, },
"oxjs": { "oxjs": {
"url": "https://git.0x2620.org/oxjs.git", "url": "https://code.0x2620.org/0x2620/oxjs.git",
"path": "./static/oxjs", "path": "./static/oxjs",
}, },
"oxtimelines": { "oxtimelines": {
"url": "https://git.0x2620.org/oxtimelines.git", "url": "https://code.0x2620.org/0x2620/oxtimelines.git",
"path": "./src/oxtimelines", "path": "./src/oxtimelines",
}, },
"python-ox": { "python-ox": {
"url": "https://git.0x2620.org/python-ox.git", "url": "https://code.0x2620.org/0x2620/python-ox.git",
"path": "./src/python-ox", "path": "./src/python-ox",
} }
} }
@ -207,12 +207,12 @@ if __name__ == "__main__":
for component in ('oxtimelines', 'python-ox'): for component in ('oxtimelines', 'python-ox'):
if not os.path.exists('./src/%s/.git' % component): if not os.path.exists('./src/%s/.git' % component):
run('./bin/pip', 'install', '-e', run('./bin/pip', 'install', '-e',
'git+https://git.0x2620.org/%s.git#egg=%s' % (component, component), 'git+https://code.0x2620.org/0x2620/%s.git#egg=%s' % (component, component),
'--exists-action', 'w') '--exists-action', 'w')
if not os.path.exists('./static/oxjs/.git'): if not os.path.exists('./static/oxjs/.git'):
if os.path.exists('static/oxjs'): if os.path.exists('static/oxjs'):
shutil.move('static/oxjs', 'static/oxjs_bzr') shutil.move('static/oxjs', 'static/oxjs_bzr')
run('git', 'clone', '--depth', '1', 'https://git.0x2620.org/oxjs.git', 'static/oxjs') run('git', 'clone', '--depth', '1', 'https://code.0x2620.org/0x2620/oxjs.git', 'static/oxjs')
run('./pandora/manage.py', 'update_static') run('./pandora/manage.py', 'update_static')
if os.path.exists('static/oxjs_bzr'): if os.path.exists('static/oxjs_bzr'):
shutil.rmtree('static/oxjs_bzr') shutil.rmtree('static/oxjs_bzr')

View file

@ -153,7 +153,7 @@ else
fi fi
# checkout pandora from git # checkout pandora from git
git clone https://git.0x2620.org/pandora.git /srv/pandora git clone https://code.0x2620.org/0x2620/pandora.git /srv/pandora
cd /srv/pandora cd /srv/pandora
git checkout $BRANCH git checkout $BRANCH
chown -R $PANDORA:$PANDORA /srv/pandora chown -R $PANDORA:$PANDORA /srv/pandora