Fixes so things actually run.

Fixes #2
dobey · Aug 18, 2018 · ae11256 · ae11256
1 parent b210311
commit ae11256
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/diogenes-ng/diogenes-ng b/diogenes-ng/diogenes-ng
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright 2018 Rodney Dawes
 #
@@ -25,7 +25,9 @@ function cleanup_on_exit {
 trap cleanup_on_exit EXIT
 
 # Start the server and grab the URL
-DIOGENES_URL=$(${DG_PERL_DIR}/diogenes-server.pl | grep "^http")
+${DG_PERL_DIR}/diogenes-server.pl >/dev/null &
+DIOGENES_PORT=$(grep ^port ${XDG_RUNTIME_DIR}/diogenes.run|cut -d' ' -f2)
+DIOGENES_URL="http://127.0.0.1:${DIOGENES_PORT}/"
 
 # Load the app
-exec qmlscnee "${DIOGENES_URL}" ${DG_DIR}/app/diogenes-ng.qml
+exec qmlscene "${DIOGENES_URL}" ${DG_DIR}/app/diogenes-ng.qml
diff --git a/diogenes-ng/perl/Diogenes/Base.pm b/diogenes-ng/perl/Diogenes/Base.pm
@@ -239,11 +239,16 @@ sub get_user_config_dir_base
     }
     elsif ($OS eq 'unix')
     {
-        if ($ENV{XDG_CONFIG_HOME})
+        my $config_home = $ENV{XDG_CONFIG_HOME};
+        if ($config_home)
         {
-            return "$ENV{XDG_CONFIG_HOME}/diogenes-ng/";
+            if (! -d $config_home)
+            {
+                mkdir($config_home);
+            }
+            return "$config_home/diogenes-ng/";
         }
-        else { warn "Could not find user profile dir! \n" }
+        print "$ENV{HOME}/.config/diogenes-ng/";
     }
     elsif ($OS eq 'mac')
     {

diff --git a/diogenes-ng/perl/diogenes-server-kill.pl b/diogenes-ng/perl/diogenes-server-kill.pl
@@ -8,7 +8,7 @@
 
 
 use Diogenes::Base;
-my $runtime_dir = $ENV{XDG_RUNTIME_DIR};
+my $runtime_dir = $ENV{'XDG_RUNTIME_DIR'};
 my $lock_file = File::Spec->catfile($runtime_dir, 'diogenes-ng.run');
 
 print "Running diogenes-server-kill.pl\n";

diff --git a/diogenes-ng/perl/diogenes-server.pl b/diogenes-ng/perl/diogenes-server.pl
@@ -55,7 +55,7 @@ package Diogenes_Daemon;
 use Getopt::Std;
 use vars qw/$opt_d $opt_p $opt_h $opt_H $opt_l $opt_m $opt_D $opt_P/;
 
-my $runtime_dir = $ENV{XDG_RUNTIME_DIR};
+my $runtime_dir = $ENV{'XDG_RUNTIME_DIR'};
 my $lock_file = File::Spec->catfile($runtime_dir, 'diogenes.run');
 
 # Mozilla wants this: it ignores css files of type text/plain.