Changed if to POSIX [] instead of [[]]
This commit is contained in:
@@ -32,36 +32,42 @@ touch /etc/crontabs/cron-jobs
|
|||||||
# Create symlinks based on what is passed
|
# Create symlinks based on what is passed
|
||||||
# Also add cronjobs when applicable
|
# Also add cronjobs when applicable
|
||||||
git clone $THE_REPO
|
git clone $THE_REPO
|
||||||
if [[ "$EXTRA_REPOS" ]]; then
|
|
||||||
touch /etc/debmirror/Repo-IP-lists/CustomMirrorListV{4,6}
|
if [ "$EXTRA_REPOS" = true ]; then
|
||||||
|
touch /etc/debmirror/Repo-IP-lists/CustomMirrorListV4
|
||||||
|
touch /etc/debmirror/Repo-IP-lists/CustomMirrorListV6
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/CustomMirrorListV4 /etc/debmirror/CustomMirrorListV4
|
ln -s /etc/debmirror/Repo-IP-lists/CustomMirrorListV4 /etc/debmirror/CustomMirrorListV4
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/CustomMirrorListV6 /etc/debmirror/CustomMirrorListV6
|
ln -s /etc/debmirror/Repo-IP-lists/CustomMirrorListV6 /etc/debmirror/CustomMirrorListV6
|
||||||
|
|
||||||
# echo "00 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainCustom.py" >> /etc/crontabs/cron-jobs
|
# echo "00 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainCustom.py" >> /etc/crontabs/cron-jobs
|
||||||
fi
|
fi
|
||||||
if [[ "$PROXMOX_REPOS" ]]; then
|
if [ "$PROXMOX_REPOS" = true ]; then
|
||||||
touch /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV{4,6}
|
touch /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV4
|
||||||
|
touch /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV6
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV4 /etc/debmirror/ProxmoxMirrorListV4
|
ln -s /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV4 /etc/debmirror/ProxmoxMirrorListV4
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV6 /etc/debmirror/ProxmoxMirrorListV6
|
ln -s /etc/debmirror/Repo-IP-lists/ProxmoxMirrorListV6 /etc/debmirror/ProxmoxMirrorListV6
|
||||||
|
|
||||||
# echo "05 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainSec.py" >> /etc/crontabs/cron-jobs
|
# echo "05 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainSec.py" >> /etc/crontabs/cron-jobs
|
||||||
fi
|
fi
|
||||||
if [[ "$DOCKER_REPOS" ]]; then
|
if [ "$DOCKER_REPOS" = true ]; then
|
||||||
touch /etc/debmirror/Repo-IP-lists/DockerMirrorListV{4,6}
|
touch /etc/debmirror/Repo-IP-lists/DockerMirrorListV4
|
||||||
|
touch /etc/debmirror/Repo-IP-lists/DockerMirrorListV6
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/DockerMirrorListV4 /etc/debmirror/DockerMirrorListV4
|
ln -s /etc/debmirror/Repo-IP-lists/DockerMirrorListV4 /etc/debmirror/DockerMirrorListV4
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/DockerMirrorListV6 /etc/debmirror/DockerMirrorListV6
|
ln -s /etc/debmirror/Repo-IP-lists/DockerMirrorListV6 /etc/debmirror/DockerMirrorListV6
|
||||||
|
|
||||||
# echo "05 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainSec.py" >> /etc/crontabs/cron-jobs
|
# echo "05 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainSec.py" >> /etc/crontabs/cron-jobs
|
||||||
fi
|
fi
|
||||||
if [[ "$DEBIAN_REPOS" ]]; then
|
if [ "$DEBIAN_REPOS" = true ]; then
|
||||||
touch /etc/debmirror/Repo-IP-lists/DebianMirrorListV{4,6}
|
touch /etc/debmirror/Repo-IP-lists/DebianMirrorListV4
|
||||||
|
touch /etc/debmirror/Repo-IP-lists/DebianMirrorListV6
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/DebianMirrorListV4 /etc/debmirror/DebianMirrorListV4
|
ln -s /etc/debmirror/Repo-IP-lists/DebianMirrorListV4 /etc/debmirror/DebianMirrorListV4
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/DebianMirrorListV6 /etc/debmirror/DebianMirrorListV6
|
ln -s /etc/debmirror/Repo-IP-lists/DebianMirrorListV6 /etc/debmirror/DebianMirrorListV6
|
||||||
|
|
||||||
# echo "10 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainDocker.py" >> /etc/crontabs/cron-jobs
|
# echo "10 */4 * * * /etc/debmirror/venv/bin/python3 /etc/debmirror/mainDocker.py" >> /etc/crontabs/cron-jobs
|
||||||
fi
|
fi
|
||||||
if [[ "$OPNSENSE_REPOS" ]]; then
|
if [ "$OPNSENSE_REPOS" = true ]; then
|
||||||
touch /etc/debmirror/Repo-IP-lists/OPNsenseMIrrorListV{4,6}
|
touch /etc/debmirror/Repo-IP-lists/OPNsenseMirrorListV4
|
||||||
|
touch /etc/debmirror/Repo-IP-lists/OPNsenseMirrorListV6
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/OPNsenseMirrorListV4 /etc/debmirror/OPNsenseMirrorListV4
|
ln -s /etc/debmirror/Repo-IP-lists/OPNsenseMirrorListV4 /etc/debmirror/OPNsenseMirrorListV4
|
||||||
ln -s /etc/debmirror/Repo-IP-lists/OPNsenseMirrorListV6 /etc/debmirror/OPNsenseMirrorListV6
|
ln -s /etc/debmirror/Repo-IP-lists/OPNsenseMirrorListV6 /etc/debmirror/OPNsenseMirrorListV6
|
||||||
|
|
||||||
|
|||||||
@@ -7,18 +7,18 @@ GITURL="${GITURL:-6767}"
|
|||||||
GITREPOPATH="${GITREPOPATH:-6767}"
|
GITREPOPATH="${GITREPOPATH:-6767}"
|
||||||
GITURLPROTO="${GITURLPROTO:-http}"
|
GITURLPROTO="${GITURLPROTO:-http}"
|
||||||
|
|
||||||
# if [[ "$GITEA_TOKEN" == "6767" || "$GITREPOPATH" == "6767" || "$GITURL" == "6767" ]]; then
|
# if [ "$GITEA_TOKEN" == "6767" || "$GITREPOPATH" == "6767" || "$GITURL" == "6767" ]; then
|
||||||
if [[ "$GITEA_TOKEN" == "6767" ]]; then
|
if [ "$GITEA_TOKEN" == "6767" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
WORKPTH="${WORKPTH:-/etc/debmirror/}"
|
WORKPTH="${WORKPTH:-/etc/debmirror/}"
|
||||||
REPO_DIR="${REPO_DIR:-$WORKPTH/Repo-IP-lists}"
|
REPO_DIR="${REPO_DIR:-$WORKPTH/Repo-IP-lists}"
|
||||||
REPO_URL="${REPO_URL:-GITURLPROTO://GITURL/GITREPOPATH}"
|
REPO_URL="${REPO_URL:-$GITURLPROTO://$GITURL/$GITREPOPATH}"
|
||||||
|
|
||||||
|
|
||||||
# Clone repo if not exists
|
# Clone repo if not exists
|
||||||
if [[ ! -d "$REPO_DIR/.git" ]]; then
|
if [ ! -d "$REPO_DIR/.git" ]; then
|
||||||
echo "[$(date)] Cloning repository..."
|
echo "[$(date)] Cloning repository..."
|
||||||
git clone "$REPO_URL" "$REPO_DIR"
|
git clone "$REPO_URL" "$REPO_DIR"
|
||||||
fi
|
fi
|
||||||
@@ -33,8 +33,8 @@ git cherry-pick --abort 2>/dev/null || true
|
|||||||
git checkout main || git checkout -b main origin/main
|
git checkout main || git checkout -b main origin/main
|
||||||
git pull --rebase --autostash
|
git pull --rebase --autostash
|
||||||
|
|
||||||
# git remote set-url origin "${GITURLPROTO}://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}"
|
git remote set-url origin "${GITURLPROTO}://${GITEA_TOKEN}@${GITURL}/${GITREPOPATH}"
|
||||||
git remote set-url origin "https://${GITEA_TOKEN}@YuruC3/Repo-IP-lists"
|
# git remote set-url origin "https://${GITEA_TOKEN}@YuruC3/Repo-IP-lists"
|
||||||
|
|
||||||
|
|
||||||
git config user.name "UpdateBot"
|
git config user.name "UpdateBot"
|
||||||
@@ -44,7 +44,7 @@ git config user.email "UpdateBot@localhost.local"
|
|||||||
git add MirrorListV4 MirrorListV6 OPNS_MirrorListV4 OPNS_MirrorListV6
|
git add MirrorListV4 MirrorListV6 OPNS_MirrorListV4 OPNS_MirrorListV6
|
||||||
|
|
||||||
# Only proceed if there are staged changes
|
# Only proceed if there are staged changes
|
||||||
if [[ ! git diff --quiet --cached ]]; then
|
if [ ! git diff --quiet --cached ]; then
|
||||||
echo "[$(date)] Committing and pushing changes..."
|
echo "[$(date)] Committing and pushing changes..."
|
||||||
git commit -m "Auto-update mirror list on $(date -Iseconds)"
|
git commit -m "Auto-update mirror list on $(date -Iseconds)"
|
||||||
# git pull --rebase --autostash
|
# git pull --rebase --autostash
|
||||||
|
|||||||
Reference in New Issue
Block a user