summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-14 06:13:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-14 06:13:33 +0000
commit6d96b7109f1319b27218ab3ce34b3e150fb42a8a (patch)
tree75afbad1dd41833f619ac858e4a4ce0938680e04
parent9b11dbde48302f8742079b0953312aab1b79c3f7 (diff)
downloaddrakx-backup-do-not-use-6d96b7109f1319b27218ab3ce34b3e150fb42a8a.tar
drakx-backup-do-not-use-6d96b7109f1319b27218ab3ce34b3e150fb42a8a.tar.gz
drakx-backup-do-not-use-6d96b7109f1319b27218ab3ce34b3e150fb42a8a.tar.bz2
drakx-backup-do-not-use-6d96b7109f1319b27218ab3ce34b3e150fb42a8a.tar.xz
drakx-backup-do-not-use-6d96b7109f1319b27218ab3ce34b3e150fb42a8a.zip
cleanup
-rwxr-xr-xperl-install/standalone/fileshareset14
1 files changed, 6 insertions, 8 deletions
diff --git a/perl-install/standalone/fileshareset b/perl-install/standalone/fileshareset
index 346426f62..6d321c7ac 100755
--- a/perl-install/standalone/fileshareset
+++ b/perl-install/standalone/fileshareset
@@ -338,15 +338,13 @@ sub name_mangle {
if (length($s) > 8 && !grep { /\Q$s/ } @others) {
# dropping leading directories when the resulting is still long and meaningful
$_ = $s;
- next;
+ } else {
+ s|(.*)[0-9#\-_!/]|$1|
+ # inspired by "Christian Brolin" "Long names are doom" on comp.lang.functional
+ || s|(.+)[AEIOU]|$1|# allButFirstVowels
+ || s|(.*)(.)\2|$1$2| # adjacentDuplicates
+ || s|(.*).|$1|; # booh, :'-(
}
- s|(.*)[0-9#\-_!/]|$1| and next;
-
- # inspired by "Christian Brolin" "Long names are doom" on comp.lang.functional
- s|(.+)[AEIOU]|$1| and next; # allButFirstVowels
- s|(.*)(.)\2|$1$2| and next; # adjacentDuplicates
-
- s|(.*).|$1|; # booh, :'-(
}
# 5. remove "/"s still there