move travis commit-scripts-yaml from inside update-scripts-yaml

diff --git a/_testing/travis/commit-scripts-yaml.zsh b/_testing/travis/commit-scripts-yaml.zsh
index 6ef54a9ac3688d3e31338202fa33bb7a6548cf40..07157db843f45c2e4a3cf0c86ae15df52278a3c9 100755 (executable)
--- a/_testing/travis/commit-scripts-yaml.zsh
+++ b/_testing/travis/commit-scripts-yaml.zsh
@@ -1,2 +1,22 @@
 #!/bin/zsh
 
+[[ -z $REPO_LOGIN_TOKEN ]] && exit
+[[ -z $TRAVIS_REPO_SLUG ]] && exit
+
+echo "https://${REPO_LOGIN_TOKEN}:x-oauth-basic@github.com" > "$HOME/.git-credentials"
+
+git config user.email "scripts@irssi.org"
+git config user.name "Irssi Scripts Helper"
+git config credential.helper store
+git config remote.origin.url "https://github.com/$TRAVIS_REPO_SLUG"
+git checkout "$TRAVIS_BRANCH"
+
+if [[ "$(git log -1 --format=%an)" != "$(git config user.name)" &&
+      "$(git log -1 --format=%cn)" != "$(git config user.name)" ]] {
+    git add _data/scripts.yaml
+    git commit -m "automatic scripts database update for $TRAVIS_COMMIT
+
+[skip ci]"
+    git config push.default simple
+    git push origin
+}

diff --git a/_testing/update-scripts-yaml.pl b/_testing/update-scripts-yaml.pl
index e554f3359423bbbca5e5e174a3bf53d9dde1ce01..2c155f7e31497e5fc0f162647043dede1c1a1a60 100644 (file)
--- a/_testing/update-scripts-yaml.pl
+++ b/_testing/update-scripts-yaml.pl
@@ -89,25 +89,3 @@ if ($config && @{$config->{whitelist}//[]}) {
        YAML::Tiny::DumpFile('_testing/config.yml', $config);
     }
 }
-
-if (exists $ENV{REPO_LOGIN_TOKEN} && exists $ENV{TRAVIS_REPO_SLUG}) {
-    { open my $cred, '>', "$ENV{HOME}/.git-credentials" or die $!;
-      print $cred "https://$ENV{REPO_LOGIN_TOKEN}:x-oauth-basic\@github.com\n";
-    }
-    system qq[
-git config user.email "scripts\@irssi.org"
-git config user.name "Irssi Scripts Helper"
-git config credential.helper store
-git config remote.origin.url https://github.com/$ENV{TRAVIS_REPO_SLUG}
-git checkout '$ENV{TRAVIS_BRANCH}'
-if [ "\$(git log -1 --format=%an)" != "\$(git config user.name)" -a \\
-     "\$(git log -1 --format=%cn)" != "\$(git config user.name)" ]; then
-    git add _data/scripts.yaml
-    git commit -m 'automatic scripts database update for $ENV{TRAVIS_COMMIT}
-
-[skip ci]'
-    git config push.default simple
-    git push origin
-fi
-];
-}