now youri-upload does not user --user anymore, have to replace it with --define user=

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/youri-upload.in b/bin/youri-upload.in
index d48afa5..5f181ff 100755
--- a/bin/youri-upload.in
+++ b/bin/youri-upload.in
@@ -90,7 +90,7 @@ Configuration is read from the first file found among:
 
 =item * $HOME/.youri/upload.conf
 
-=item * @sysconfdir@/youri/upload.conf
+=item * /usr/local/etc/youri/upload.conf
 
 =back
 
@@ -166,7 +166,7 @@ my $config = Youri::Config->new(
         'targets=s',
         'repository=s',
     ],
-    directories => [ '@sysconfdir@', "$ENV{HOME}/.youri" ],
+    directories => [ '/usr/local/etc', "$ENV{HOME}/.youri" ],
     file_name   => 'upload.conf',
     caller => $0,
 );
@@ -209,7 +209,7 @@ eval {
     $repository = create_instance(
         'Youri::Repository',
         test    => $test,
-	user     => $config->get('user'),
+	user     => $config->get('define')->{user},
         verbose => $verbose > 0 ? $verbose - 1 : 0,
         targets => [ keys %targets ],
         $config->get_section($repository_id)
@@ -241,7 +241,7 @@ foreach my $id (@{$target{checks}}) {
             'Youri::Upload::Check',
             id       => $id,
             test     => $test,
-	    user     => $config->get('user'),
+	    user     => $config->get('define')->{user},
             verbose  => $verbose > 0 ? $verbose - 1 : 0,
             $config->get_section($id)
         );