From 83b33d0888ee7b9623a83685df6e45895aca7bda Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 6 Sep 2016 22:43:51 +0200 Subject: whitespace clean-up: Script-based whitespace clean-up. --- debian/copyright | 2 +- lib/Arctica/Core/Basics.pm | 16 ++++++++-------- lib/Arctica/Core/ManageDirs.pm | 40 ++++++++++++++++++++-------------------- lib/Arctica/Core/Version.pm | 2 +- lib/Arctica/Core/eventInit.pm | 6 +++--- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/debian/copyright b/debian/copyright index a9e8ec2..44af67c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,7 +34,7 @@ License: GPL-2 License: AGPL-3+ Arctica Framework is free software; you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . diff --git a/lib/Arctica/Core/Basics.pm b/lib/Arctica/Core/Basics.pm index 54bf052..283b2ae 100644 --- a/lib/Arctica/Core/Basics.pm +++ b/lib/Arctica/Core/Basics.pm @@ -13,7 +13,7 @@ # ################################################################################ # -# Copyright (C) 2015-2016 The Arctica Project +# Copyright (C) 2015-2016 The Arctica Project # http://http://arctica-project.org/ # # This code is dual licensed: strictly GPL-2 or AGPL-3+ @@ -88,7 +88,7 @@ sub aex_initNameClassVersion { } else { $NVC{'app_version'} = "0.0.0.0";#LAZY DEV FORGOT VERSION DECL!?! } - + ($NVC{'self_aID'},$NVC{'parent_aID'}) = setncycle_parent_aid($NVC{'app_name'} ); return %NVC; @@ -134,7 +134,7 @@ sub genARandom { $r_string .= $p_chars[int(rand($#p_chars + 1))]; } return "$time$r_string"; - + } elsif ($in_type eq "key") { if ($in_length =~ /^(\d{1,})$/) { $in_length = $1; @@ -154,7 +154,7 @@ sub genARandom { $r_string .= $p_chars[int(rand($#p_chars + 1))]; } return $r_string; - + } elsif ($in_type eq "dirtail") { if ($in_length =~ /^(\d{1,})$/) { $in_length = $1; @@ -174,7 +174,7 @@ sub genARandom { $r_string .= $p_chars[int(rand($#p_chars + 1))]; } return $r_string; - + } else { die("INVALID RANDOM TYPE?"); } @@ -210,8 +210,8 @@ sub arcticaAArt { my $leftPadding = (($termwidth - $baWidest)/2); foreach my $baLine (@baseArt) { if ($boxIt eq 1) {#$termwidth - $baLine =~ s/^(.*)/'#' . ' ' x ($leftPadding-1) . $1 . - ' ' x ($termwidth-(length($baLine)+($leftPadding+1))) + $baLine =~ s/^(.*)/'#' . ' ' x ($leftPadding-1) . $1 . + ' ' x ($termwidth-(length($baLine)+($leftPadding+1))) . '#'/ge; } else { $baLine =~ s/^(.*)/' ' x $leftPadding . $1/ge; @@ -220,7 +220,7 @@ sub arcticaAArt { } if ($boxIt eq 1) {#$termwidth $finalAArt =~ s/^(.*)/'#' x $termwidth . "\n". $1/e; - $finalAArt =~ s/(.*)$/$1 . "\n#" . ' ' x ($termwidth-2). + $finalAArt =~ s/(.*)$/$1 . "\n#" . ' ' x ($termwidth-2). "#\n". '#' x $termwidth . "\n"/e; } return $finalAArt; diff --git a/lib/Arctica/Core/ManageDirs.pm b/lib/Arctica/Core/ManageDirs.pm index d17d22f..184116c 100644 --- a/lib/Arctica/Core/ManageDirs.pm +++ b/lib/Arctica/Core/ManageDirs.pm @@ -13,7 +13,7 @@ # ################################################################################ # -# Copyright (C) 2015-2016 The Arctica Project +# Copyright (C) 2015-2016 The Arctica Project # http://http://arctica-project.org/ # # This code is dual licensed: strictly GPL-2 or AGPL-3+ @@ -90,7 +90,7 @@ sub new { } unless (-d $check_arctica_home) { - mkdir($check_arctica_home) + mkdir($check_arctica_home) or die("ManageDirs: Failed to create .arctica 'HOME' directory"); } @@ -134,7 +134,7 @@ sub permZealot { $the_path =~ s/\n//g; if (-f $the_path) { - chmod(0600,$the_path) + chmod(0600,$the_path) or die("permZealot: Can't set permissions on \"$the_path\"!"); unless (check_secure_permissions($the_path)) { @@ -142,7 +142,7 @@ sub permZealot { } BugOUT(9,"permZealot-> set chmod 0600 for file $the_path"); } elsif (-d $the_path) { - chmod(0700,$the_path) + chmod(0700,$the_path) or die("permZealot: Can't set permissions on \"$the_path\"!"); unless (check_secure_permissions($the_path)) { @@ -150,7 +150,7 @@ sub permZealot { } BugOUT(9,"permZealot-> set chmod 0600 for dir $the_path"); } elsif (-S $the_path) { - chmod(0700,$the_path) + chmod(0700,$the_path) or die("permZealot: Can't set permissions on \"$the_path\"!"); unless (check_secure_permissions($the_path)) { @@ -169,35 +169,35 @@ sub create_new_adir { my $the_random_dirtail = genARandom('dirtail',16); my $potential_new_adir = ".arctica\-$the_sanetized_username\-$the_random_dirtail"; unless (-d "$the_tmp_dir/$potential_new_adir") { - mkdir("$the_tmp_dir/$potential_new_adir") + mkdir("$the_tmp_dir/$potential_new_adir") or die("Unable to create '$the_tmp_dir/$potential_new_adir'"); permZealot("$the_tmp_dir/$potential_new_adir"); - mkdir("$the_tmp_dir/$potential_new_adir/cli") + mkdir("$the_tmp_dir/$potential_new_adir/cli") or die("Unable to create '$the_tmp_dir/$potential_new_adir/cli'"); permZealot("$the_tmp_dir/$potential_new_adir/cli"); - mkdir("$the_tmp_dir/$potential_new_adir/ses") + mkdir("$the_tmp_dir/$potential_new_adir/ses") or die("Unable to create '$the_tmp_dir/$potential_new_adir/ses'"); permZealot("$the_tmp_dir/$potential_new_adir/ses"); - mkdir("$the_tmp_dir/$potential_new_adir/con") + mkdir("$the_tmp_dir/$potential_new_adir/con") or die("Unable to create '$the_tmp_dir/$potential_new_adir/con'"); permZealot("$the_tmp_dir/$potential_new_adir/con"); - mkdir("$the_tmp_dir/$potential_new_adir/soc") + mkdir("$the_tmp_dir/$potential_new_adir/soc") or die("Unable to create '$the_tmp_dir/$potential_new_adir/soc'"); permZealot("$the_tmp_dir/$potential_new_adir/soc"); - mkdir("$the_tmp_dir/$potential_new_adir/soc/local/") + mkdir("$the_tmp_dir/$potential_new_adir/soc/local/") or die("Unable to create '$the_tmp_dir/$potential_new_adir/soc/local/'"); permZealot("$the_tmp_dir/$potential_new_adir/soc/local/"); - mkdir("$the_tmp_dir/$potential_new_adir/soc/remote/") + mkdir("$the_tmp_dir/$potential_new_adir/soc/remote/") or die("Unable to create '$the_tmp_dir/$potential_new_adir/soc/remote/'"); permZealot("$the_tmp_dir/$potential_new_adir/soc/remote/"); - mkdir("$the_tmp_dir/$potential_new_adir/soc/remote/in/") + mkdir("$the_tmp_dir/$potential_new_adir/soc/remote/in/") or die("Unable to create '$the_tmp_dir/$potential_new_adir/soc/remote/in/'"); permZealot("$the_tmp_dir/$potential_new_adir/soc/remote/in/"); - mkdir("$the_tmp_dir/$potential_new_adir/soc/remote/out/") + mkdir("$the_tmp_dir/$potential_new_adir/soc/remote/out/") or die("Unable to create '$the_tmp_dir/$potential_new_adir/soc/remote/out/'"); permZealot("$the_tmp_dir/$potential_new_adir/soc/remote/out/"); @@ -206,7 +206,7 @@ sub create_new_adir { } else { die("Realizing '$the_tmp_dir/$potential_new_adir' already exist?!"); } - + BugOUT(9,"Unexpected end of 'create_new_adir'"); } @@ -244,14 +244,14 @@ sub check_for_rtail_dir { } } closedir(CHKDIR); - + my $pdircnt = @potential_dirs; - my $pdmtime = 0; + my $pdmtime = 0; if ($pdircnt > 0) { if ($pdircnt > 1) { warn("check_for_rtail_dir: more than one tmp dir?"); } - # Pick the one with highest mtime.... + # Pick the one with highest mtime.... foreach my $pdir (@potential_dirs) { $pdir =~ s/[\s\n]//g; if (-d "$check_in_dir/$pdir") { @@ -274,7 +274,7 @@ sub check_for_rtail_dir { warn("check_for_rtail_dir: no existing dirs found!"); return 0; } - + } else { die("rtail check fail! This is not a dir: \"$check_in_dir\""); } @@ -332,7 +332,7 @@ sub user_owns_it { unless ($the_user) { $the_user = $ENV{'USER'}; } - + my $file_stat = stat($the_path); if (getpwuid($file_stat->uid) eq $the_user) { return 1; diff --git a/lib/Arctica/Core/Version.pm b/lib/Arctica/Core/Version.pm index 77bc83d..82d712d 100644 --- a/lib/Arctica/Core/Version.pm +++ b/lib/Arctica/Core/Version.pm @@ -13,7 +13,7 @@ # ################################################################################ # -# Copyright (C) 2015-2016 The Arctica Project +# Copyright (C) 2015-2016 The Arctica Project # http://http://arctica-project.org/ # # This code is dual licensed: strictly GPL-2 or AGPL-3+ diff --git a/lib/Arctica/Core/eventInit.pm b/lib/Arctica/Core/eventInit.pm index 3a40b04..8055285 100644 --- a/lib/Arctica/Core/eventInit.pm +++ b/lib/Arctica/Core/eventInit.pm @@ -13,7 +13,7 @@ # ################################################################################ # -# Copyright (C) 2015-2016 The Arctica Project +# Copyright (C) 2015-2016 The Arctica Project # http://http://arctica-project.org/ # # This code is dual licensed: strictly GPL-2 or AGPL-3+ @@ -76,7 +76,7 @@ my $SELF; sub new { unless ($SELF) { my ($className,$theRest) = @_; - my $ACF_self = { + my $ACF_self = { dummydata => { somevalue => 12, otherinfo => "The Other INFO!", @@ -133,7 +133,7 @@ sub doSelfTerminate { my $ACF_self = $_[1]; BugOUT(2,"Self-terminating... ($signal)"); $ACF_self->{'Glib'}{'MainLoop'}->quit; - return 0; + return 0; } # THE END ################################################################################ -- cgit v1.2.3