From cafb8b3fd46b4114ea6c49fecee6d2c2a3be5115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Thu, 11 Mar 1999 14:31:05 -0800
Subject: [PATCH] now handles replacing files with directories
Rev: bin/install.pike:1.7
Rev: lib/modules/Stdio.pmod:1.37(DEAD)
Rev: lib/modules/Stdio.pmod/module.pmod:1.37
---
.gitattributes | 1 +
bin/install.pike | 5 +++--
lib/modules/{Stdio.pmod => Stdio.pmod/module.pmod} | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
rename lib/modules/{Stdio.pmod => Stdio.pmod/module.pmod} (99%)
diff --git a/.gitattributes b/.gitattributes
index 30a4d9102e..6387d6aee7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -74,6 +74,7 @@ testfont binary
/lib/modules/Sql.pmod/sql.pike foreign_ident
/lib/modules/Sql.pmod/sql_result.pike foreign_ident
/lib/modules/Stdio.pmod foreign_ident
+/lib/modules/Stdio.pmod/module.pmod foreign_ident
/lib/modules/Yabu.pmod/module.pmod foreign_ident
/lib/modules/error.pmod foreign_ident
/man/hilfe.1 foreign_ident
diff --git a/bin/install.pike b/bin/install.pike
index 295d2372af..764e62ad5f 100644
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -36,8 +36,9 @@ int mkdirhier(string dir)
if(s[1]<0)
return 1;
- werror("mkdir: Directory '%s' already exists as a file.\n",dir);
- exit(1);
+ werror("Warning: Directory '%s' already exists as a file.\n",dir);
+ if(!mv(dir,dir+".old"))
+ fail("mv(%s,%s)",tmpfile,to);
}
mkdirhier(dirname(dir));
diff --git a/lib/modules/Stdio.pmod b/lib/modules/Stdio.pmod/module.pmod
similarity index 99%
rename from lib/modules/Stdio.pmod
rename to lib/modules/Stdio.pmod/module.pmod
index 3386138d9e..59aa991438 100644
--- a/lib/modules/Stdio.pmod
+++ b/lib/modules/Stdio.pmod/module.pmod
@@ -1,4 +1,4 @@
-// $Id: Stdio.pmod,v 1.37 1999/01/30 01:35:08 grubba Exp $
+// $Id: module.pmod,v 1.37 1999/03/11 22:31:05 hubbe fake $
#include <string.h>
--
GitLab