From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 13 Apr 2017 22:59:37 +0000 (+0200)
Subject: icons: Fix import script
X-Git-Tag: travis-deploy-test~297
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=78f7750301f8234d390bc7d239bc0d2b94fb8ddf

icons: Fix import script

Make it work with newer Perl, and some other tweaks.
---

diff --git a/icons/import/import_theme.pl b/icons/import/import_theme.pl
index e835a76a..cea05c80 100755
--- a/icons/import/import_theme.pl
+++ b/icons/import/import_theme.pl
@@ -14,6 +14,7 @@
 # Run from the icon/ directory.
 
 use strict;
+use warnings;
 use Data::Dumper;
 use File::Find;
 
@@ -131,7 +132,7 @@ closedir BASEDIR;
 if ($scalableFound) {
   foreach my $cat (keys %scalables) {
     system "mkdir -p $themename/scalable/$cat" and die "Could not create category dir\n";
-    foreach my $scalable (keys $scalables{$cat}) {
+    foreach my $scalable (keys %{$scalables{$cat}}) {
       system "cp -aL $themefolder/scalable/$cat/$scalable.svgz $themename/scalable/$cat/$scalable.svgz";
     }
   }
@@ -144,7 +145,7 @@ foreach my $icon (keys %req_icons) {
 }
 
 # Copy license etc.
-system "cp $themefolder/AUTHORS $themefolder/CONTRIBUTING $themefolder/COPYING $themefolder/index.theme $themename/";
+system "cp $themefolder/AUTHORS $themefolder/CONTRIBUTING $themefolder/COPYING* $themefolder/index.theme $themename/";
 
 # Generate .qrc
 my @file_list;