diff options
| author | onefang | 2022-03-18 21:11:47 +1000 |
|---|---|---|
| committer | onefang | 2022-03-18 21:11:47 +1000 |
| commit | fadae57393e1bac94e3f2b35f89eab664a013843 (patch) | |
| tree | a21886e94e68629a55c4f9dd2844c5049a25caa3 | |
| parent | Don't run mono with --debug. (diff) | |
| download | opensim-SC-fadae57393e1bac94e3f2b35f89eab664a013843.zip opensim-SC-fadae57393e1bac94e3f2b35f89eab664a013843.tar.gz opensim-SC-fadae57393e1bac94e3f2b35f89eab664a013843.tar.bz2 opensim-SC-fadae57393e1bac94e3f2b35f89eab664a013843.tar.xz | |
Safer directory deletes.
| -rw-r--r-- | src/sledjchisl/sledjchisl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index 2c96496..73a29f3 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c | |||
| @@ -1345,9 +1345,9 @@ static void buildOpensim() | |||
| 1345 | if (shellMeFail("cd %s; find -name *.csproj -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); | 1345 | if (shellMeFail("cd %s; find -name *.csproj -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); |
| 1346 | if (shellMeFail("cd %s; find -name *.csproj.* -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); | 1346 | if (shellMeFail("cd %s; find -name *.csproj.* -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); |
| 1347 | if (shellMeFail("cd %s; find -name *.pdb -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); | 1347 | if (shellMeFail("cd %s; find -name *.pdb -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); |
| 1348 | if (shellMeFail("cd %s; rm -fr bin/ScriptEngines", t)) E("Failed to rm ScriptEngines!"); | 1348 | if (shellMeFail("rm -fr %s/bin/ScriptEngines", t)) E("Failed to rm ScriptEngines!"); |
| 1349 | // Clean the stuff the tests created. | 1349 | // Clean the stuff the tests created. |
| 1350 | if (shellMeFail("cd %s; rm Test*.txt", t)) E("Failed to Test results!"); | 1350 | if (shellMeFail("rm %s/Test*.txt", t)) E("Failed to Test results!"); |
| 1351 | /* | 1351 | /* |
| 1352 | # Prebuild converts Microsoft.CSharp.targets to Microsoft.CSHARP.Targets, which case sensitive file systems fail to find. | 1352 | # Prebuild converts Microsoft.CSharp.targets to Microsoft.CSHARP.Targets, which case sensitive file systems fail to find. |
| 1353 | #find -name *.csproj | xargs sed -i "s@Microsoft.CSHARP.Targets@Microsoft.CSharp.targets@g" | 1353 | #find -name *.csproj | xargs sed -i "s@Microsoft.CSHARP.Targets@Microsoft.CSharp.targets@g" |
| @@ -2485,7 +2485,7 @@ TODO - | |||
| 2485 | if (strcmp(".oar", &t[l - 4]) == 0) {t[l - 4] = '\0'; l -= 4;} | 2485 | if (strcmp(".oar", &t[l - 4]) == 0) {t[l - 4] = '\0'; l -= 4;} |
| 2486 | I("Adding %s to %s", ourARs->ARs[i], gtr); | 2486 | I("Adding %s to %s", ourARs->ARs[i], gtr); |
| 2487 | // Deal with deletions in the inventory / sim, easy method, which becomes a nop for files that stay in the git add below. | 2487 | // Deal with deletions in the inventory / sim, easy method, which becomes a nop for files that stay in the git add below. |
| 2488 | if (shellMeFail("cd %s/%s; rm -fr * >>%s", dir, gar, gerr)) E("Failed to rm!"); | 2488 | if (shellMeFail("rm -fr %s/%s/* >>%s", dir, gar, gerr)) E("Failed to rm!"); |
| 2489 | if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -xzf \"%s/%s\" || echo \"ERROR - Could not unpack %s !\" >>%s", | 2489 | if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -xzf \"%s/%s\" || echo \"ERROR - Could not unpack %s !\" >>%s", |
| 2490 | dir, gar, scBackup, ourARs->ARs[i], ourARs->ARs[i], gerr)) E("Failed to unpack %s!", ourARs->ARs[i]); | 2490 | dir, gar, scBackup, ourARs->ARs[i], ourARs->ARs[i], gerr)) E("Failed to unpack %s!", ourARs->ARs[i]); |
| 2491 | if (!hasContents(gerr)) | 2491 | if (!hasContents(gerr)) |