Gallery2: gal-scan --update supported

[gallery.git] / gal2 / bin / gal-mj-upload

diff --git a/gal2/bin/gal-mj-upload b/gal2/bin/gal-mj-upload
index 5ce096dcad41274546c36c285d8a3e90011edf0c..f33da4242a102c88721ddde1833812edcddb2f8b 100755 (executable)
--- a/gal2/bin/gal-mj-upload
+++ b/gal2/bin/gal-mj-upload
@@ -3,6 +3,14 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

+print "## Updating Git\n";
+system "git", "pull";
+die if $?;
+
+print "## Ensuring that photos are generated\n";
+system "gal", "gen";
+die if $?;
+

 use Cwd;
 my $cwd = getcwd;
 my ($root, $album) = $cwd =~ m{(.*)/photos/(.*)} or die "Cannot identify album from current directory, giving up.\n";
 use Cwd;
 my $cwd = getcwd;
 my ($root, $album) = $cwd =~ m{(.*)/photos/(.*)} or die "Cannot identify album from current directory, giving up.\n";


@@ -13,8 +21,18 @@ print "## Uploading album $album\n";
 system "rs", "$static/", "jw:www/static/gallery/photo/$album/";
 die if $?;
 
 system "rs", "$static/", "jw:www/static/gallery/photo/$album/";
 die if $?;
 

+print "## Calling editor on index files\n";
+system 'vim', 'gallery.cf', "$root/photos/Makefile", "$root/photos/index.thtml";
+die if $?;
+
+print "## Committing to repository\n";
+system 'git', 'add', 'gallery.cf', 'gallery.list'; die if #?;
+system 'git', 'add', "$root/photos/Makefile", "$root/photos/index.thtml"; die if $?;
+system 'git', 'commit'; die if $?;
+system 'git', 'push'; die if $?;
+

 print "## Pulling at the server\n";
 print "## Pulling at the server\n";

-system "ssh", "jw", "cd web && git pull";
+system "ssh", "jw", "cd web && git pull && make";

 die if $?;
 
 print "## Regenerating cache at the server\n";
 die if $?;
 
 print "## Regenerating cache at the server\n";