Changeset 1215 for trunk/locker/deploy/bin

Timestamp:

Jun 30, 2009, 4:54:48 PM (14 years ago)

Author:

ezyang

Message:

Implement enhanced logic for Git-style installs; namely, removing patching facilities that are built into Git and generating an empty commit when performing the install to subsume .scripts-version.

Location:

trunk/locker/deploy/bin

Files:

• mediawiki (modified) (1 diff)
• onathena (modified) (1 diff)
• onserver.pm (modified) (2 diffs)

trunk/locker/deploy/bin/mediawiki

@@ -5 +5 @@
 
 setup();
-
-`cp skins/common/images/mediawiki.png skins/common/images/wiki.png`;
-`patch -s -p1 < /mit/scripts/deploy/mediawiki.patch`;
 
 print "\nPlease decide upon a title for your wiki and enter it below.\n";

trunk/locker/deploy/bin/onathena

@@ -236 +236 @@
 
 # xavid: use p to keep the same permissions as in the file
-if [ "$deploy" = "mediawiki" ]; then
+repo="/mit/scripts/wizard$scriptsdev/srv/$deploy.git"
+if [ -e "$repo" ]; then
   admin=`cat .admin`
   rm .admin
-  git clone --shared "/mit/scripts/wizard$scriptsdev/srv/$deploy.git" .
+  ls -Al
+  athrun git git init
+  echo "Deny from all" > ".git/.htaccess"
+  echo "$repo/objects" > ".git/objects/info/alternates"
+  athrun git git remote add origin "$repo"
+  athrun git git config branch.master.remote origin
+  athrun git git config branch.master.merge refs/heads/master
+  athrun git git fetch origin
+  athrun git git branch --track master origin/master
+  athrun git git checkout master
   echo "$admin" > .admin
 else

trunk/locker/deploy/bin/onserver.pm

@@ -9 +9 @@
 use POSIX qw(strftime);
 use LWP::UserAgent;
+use IPC::Open2;
 use URI;
 our @ISA = qw(Exporter);
@@ -127 +128 @@
   }
   
-  open(VERSION, ">.scripts-version") or die "Can't write scripts-version file: $!\n";
-  print VERSION strftime("%F %T %z\n", localtime);
-  print VERSION $ENV{'USER'}, '@', getclienthostname(), "\n";
-  my $tarball = abs_path("/mit/scripts/deploy$scriptsdev/$deploy.tar.gz");
-  print VERSION $tarball, "\n";
-  $tarball =~ s|/deploydev/|/deploy/|;
-  print VERSION dirname($tarball), "\n";
-  close(VERSION);
+  if(-e "/mit/scripts/wizard$scriptsdev/srv/$deploy.git") {
+    # fake an empty commit to get version info
+    my $pid = open2(\*GIT_OUT, \*GIT_IN, "git commit-tree HEAD: -p HEAD") or die "Can't execute git process";
+    print GIT_IN "User autoinstalled application\n";
+    print GIT_IN "Installed-by: ", $ENV{'USER'}, '@', getclienthostname(), "\n";
+    close(GIT_IN);
+    my $hash=<GIT_OUT>;
+    chomp($hash);
+    close(GIT_OUT);
+    waitpid $pid, 0; # reap zombies
+    system("git reset $hash");
+  } else {
+    open(VERSION, ">.scripts-version") or die "Can't write scripts-version file: $!\n";
+    print VERSION strftime("%F %T %z\n", localtime);
+    print VERSION $ENV{'USER'}, '@', getclienthostname(), "\n";
+    my $tarball = abs_path("/mit/scripts/deploy$scriptsdev/$deploy.tar.gz");
+    print VERSION $tarball, "\n";
+    $tarball =~ s|/deploydev/|/deploy/|;
+    print VERSION dirname($tarball), "\n";
+    close(VERSION);
+  }
 
   select STDOUT;