Index: branches/fc11-dev/locker/deploy/bin/advancedbook
===================================================================
--- branches/fc11-dev/locker/deploy/bin/advancedbook	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/advancedbook	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 
Index: branches/fc11-dev/locker/deploy/bin/advancedpoll
===================================================================
--- branches/fc11-dev/locker/deploy/bin/advancedpoll	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/advancedpoll	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 
Index: branches/fc11-dev/locker/deploy/bin/django
===================================================================
--- branches/fc11-dev/locker/deploy/bin/django	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/django	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 
Index: branches/fc11-dev/locker/deploy/bin/e107
===================================================================
--- branches/fc11-dev/locker/deploy/bin/e107	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/e107	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 
Index: branches/fc11-dev/locker/deploy/bin/gallery2
===================================================================
--- branches/fc11-dev/locker/deploy/bin/gallery2	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/gallery2	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver_star;
 use File::Path
Index: branches/fc11-dev/locker/deploy/bin/joomla
===================================================================
--- branches/fc11-dev/locker/deploy/bin/joomla	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/joomla	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 use File::Path;
Index: branches/fc11-dev/locker/deploy/bin/mediawiki
===================================================================
--- branches/fc11-dev/locker/deploy/bin/mediawiki	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/mediawiki	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 
Index: branches/fc11-dev/locker/deploy/bin/mediawiki-star
===================================================================
--- branches/fc11-dev/locker/deploy/bin/mediawiki-star	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/mediawiki-star	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver_star;
 
Index: branches/fc11-dev/locker/deploy/bin/phpbb
===================================================================
--- branches/fc11-dev/locker/deploy/bin/phpbb	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/phpbb	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver_star;
 use File::Path;
Index: branches/fc11-dev/locker/deploy/bin/phpical
===================================================================
--- branches/fc11-dev/locker/deploy/bin/phpical	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/phpical	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 
Index: branches/fc11-dev/locker/deploy/bin/trac
===================================================================
--- branches/fc11-dev/locker/deploy/bin/trac	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/trac	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 use Cwd;
Index: branches/fc11-dev/locker/deploy/bin/wordpress
===================================================================
--- branches/fc11-dev/locker/deploy/bin/wordpress	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/wordpress	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver;
 use DBI;
Index: branches/fc11-dev/locker/deploy/bin/wordpress-star
===================================================================
--- branches/fc11-dev/locker/deploy/bin/wordpress-star	(revision 1224)
+++ branches/fc11-dev/locker/deploy/bin/wordpress-star	(revision 1226)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use strict;
-use lib '/mit/scripts/deploy/bin';
+use FindBin qw($Bin);
+use lib $Bin;
 use onserver_star;
 use DBI;
Index: branches/fc11-dev/server/common/oursrc/athrun/athrun.sh
===================================================================
--- branches/fc11-dev/server/common/oursrc/athrun/athrun.sh	(revision 1224)
+++ branches/fc11-dev/server/common/oursrc/athrun/athrun.sh	(revision 1226)
@@ -13,5 +13,5 @@
   ;;
 1)
-  exec "/mit/$1/bin/$1"
+  exec "/mit/$1/arch/@sys/bin/$1"
   ;;
 *)
@@ -19,5 +19,5 @@
   program=$2
   shift 2;
-  exec "/mit/$locker/bin/$program" "$@"
+  exec "/mit/$locker/arch/@sys/bin/$program" "$@"
   ;;
 esac