Use HOME directory when non-root

DFabric · Aug 19, 2018 · 523ef39 · 523ef39
1 parent 45af0c7
commit 523ef39
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ To list [available packages](https://github.com/DFabric/package-sources) (applic
 A typical installation can be:
 
 ```sh
-# add a new application to the system (default: /opt/dppm)
+# add a new application to the system
 dppm p add [application]
 
 # start the service and  auto start the service at boot

diff --git a/src/dppm/cli.cr b/src/dppm/cli.cr
@@ -1,13 +1,12 @@
 require "clicr"
 
+# Global constant variables
 CONFIG_FILE = "./config.ini"
-PREFIX      = "/opt/dppm"
+PREFIX      = Owner.root? ? "/opt/dppm" : ENV["HOME"] + "/dppm"
 
 module CLI
   extend self
   include Clicr
-  # Global constant variables
-  VERSION = "2018-alpha"
 
   def run
     create(
@@ -226,7 +225,7 @@ module CLI
     )
   rescue ex : Help
     puts ex; exit 0
-  rescue ex : ArgumentRequired | UnknownCommandOrVariable | UnknownOption
+  rescue ex : ArgumentRequired | UnknownCommand | UnknownOption | UnknownVariable
     abort ex
   rescue ex
     Log.error ex.to_s

diff --git a/src/dppm/cmd.cr b/src/dppm/cmd.cr
@@ -1,3 +1,5 @@
+require "exec"
+
 module Cmd
   def self.find_bin(pkgdir, cmd)
     path = "#{pkgdir}/bin/#{cmd}"
@@ -194,10 +196,9 @@ module Cmd
       when "untar_gz"  then execute "/bin/tar", ["zxf", cmd[1], "-C", cmd[2]]; "gzip archive extracted"
       when "untar_lz"  then execute "/bin/tar", ["axf", cmd[1], "-C", cmd[2]]; "lz archive extracted"
       when "untar_xz"  then execute "/bin/tar", ["Jxf", cmd[1], "-C", cmd[2]]; "xz archive extracted"
+      when "exit"      then puts "exit called, exiting."; exit 1
       when "true"      then "true"
       when "false"     then "false"
-      when "exit"
-        puts "exit called, exiting."; exit 1
         # System executable
       when .starts_with? '/' then execute cmd[0], cmd[1..-1]
       else

diff --git a/src/dppm/localhost.cr b/src/dppm/localhost.cr
@@ -1,5 +1,4 @@
 require "socket"
-require "exec"
 
 struct Localhost
   class_getter proc_ver : Array(String) = File.read("/proc/version").split(' ')

diff --git a/src/dppm/package/add.cr b/src/dppm/package/add.cr
@@ -90,25 +90,21 @@ struct Package::Add
       owner_id = Owner.available_id.to_s
       if uid = @vars["uid"]?
         @vars["user"] = Owner.to_user uid
+      elsif user = @vars["user"]?
+        @vars["uid"] = Owner.to_user user
       else
-        if user = @vars["user"]?
-          @vars["uid"] = Owner.to_user user
-        else
-          @vars["user"] = @name
-          @vars["uid"] = owner_id
-          @add_user = true
-        end
+        @vars["user"] = @name
+        @vars["uid"] = owner_id
+        @add_user = true
       end
       if gid = @vars["gid"]?
         @vars["group"] = Owner.to_group gid
+      elsif group = @vars["group"]?
+        @vars["gid"] = Owner.to_group group
       else
-        if group = @vars["group"]?
-          @vars["gid"] = Owner.to_group group
-        else
-          @vars["group"] = @name
-          @vars["gid"] = owner_id
-          @add_group = true
-        end
+        @vars["group"] = @name
+        @vars["gid"] = owner_id
+        @add_group = true
       end
     else
       @vars["group"], @vars["gid"] = Owner.current_uid_gid.map &.to_s