Try to maintain history

This commit is contained in:
Nemo 2020-04-27 11:18:07 +05:30
parent f2ac77c5e3
commit 70e2a96dce
2 changed files with 11 additions and 10 deletions

13
ci.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -euo pipefail
IFS=$'\n\t'
BRANCH="gh-pages"
# Run the scan
cd website
@ -9,13 +9,14 @@ bundle install
bundle show
bundle exec jekyll build --verbose --destination _site
git clone "$GIT_REMOTE" --branch "$BRANCH" /tmp/remote_site
if ([ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]); then
cd _site
git init
git remote add origin "$GIT_REMOTE"
cp -r _site/* /tmp/remote_site
cd /tmp/remote_site
git add .
git commit -m "Deploy to GitHub Pages"
git push --force --quiet origin master:gh-pages > /dev/null 2>&1
git commit -m "Update: `date`"
git push --force --quiet origin > /dev/null 2>&1
echo 'Build successful, deployed to gh-pages.'
else
echo "Build successful, but not deploying!"

View File

@ -8,7 +8,7 @@
# `website/_data/ip.json`. Structure is at ipapi.co
for domain in $(grep -v '^#' tlds.txt); do
RESULT=$(dig +time=1 +tries=1 +short "$domain" | head -c -1 | tr '\n' '@' | sed 's/@/`,`/g' | grep -v "connection timed out")
RESULT=$(dig +time=1 +tries=1 +short "$domain." | head -c -1 | tr '\n' '@' | sed 's/@/`,`/g' | grep -v "connection timed out")
if [ ! -z "$RESULT" ]; then
echo $domain
DOMAIN_REAL="$domain"