Install DPPM service optionally when available

DFabric · Sep 8, 2019 · 973d99c · 973d99c
1 parent 728cec6
commit 973d99c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -26,7 +26,7 @@ steps:
     path: /root/.cache
   image: jrei/crystal-alpine
   commands:
-  - crystal spec
+  - crystal spec -D allow_root
 
 - name: build docs
   image: jrei/crystal-alpine

diff --git a/src/cli.cr b/src/cli.cr
@@ -402,7 +402,8 @@ module DPPM::CLI
       app.add(
         vars: {"uid" => Process.uid.to_s, "gid" => Process.gid.to_s},
         shared: true,
-        confirmation: !no_confirm
+        confirmation: !no_confirm,
+        add_service: !!Host.service_available?
       ) do
         no_confirm || CLI.confirm_prompt { raise "DPPM installation canceled." }
       end

diff --git a/src/host.cr b/src/host.cr
@@ -62,9 +62,14 @@ struct DPPM::Host
     Log.error "Unsupported architecture"; exit 1
   {% end %}
 
+  def self.service_available?
+    Service.init? || Log.warn "services management unavailable", "DPPM is still usable. Consider OpenRC or systemd init systems"
+    Service.init?
+  end
+
   # All system environment variables
   class_getter vars : Hash(String, String) do
-    Service.init? || DPPM::Log.warn "services management unavailable", "DPPM is still usable. Consider OpenRC or systemd init systems"
+    service_available?
     {
       "arch"        => @@arch,
       "kernel"      => @@kernel,

diff --git a/src/prefix/pkg.cr b/src/prefix/pkg.cr
@@ -88,7 +88,7 @@ class DPPM::Prefix::Pkg
   def create_global_bin_symlinks(force : Bool = false)
     each_binary_with_path do |path, binary|
       global_bin = Path["/usr/local/bin", binary].to_s
-      File.delete global_bin if File.exists? global_bin
+      File.delete global_bin if File.symlink?(global_bin) || File.exists?(global_bin)
       File.symlink (path / binary).to_s, global_bin
     end
   end

diff --git a/src/service.cr b/src/service.cr
@@ -2,10 +2,12 @@ require "exec"
 require "./service/*"
 
 module Service
+  extend self
+
   @@init : Systemd.class | OpenRC.class | Nil
   @@initialized = false
 
-  def self.init? : Systemd.class | OpenRC.class | Nil
+  def init? : Systemd.class | OpenRC.class | Nil
     if !@@initialized
       init_system = File.basename File.real_path "/sbin/init"
       if init_system == "systemd"
@@ -18,11 +20,11 @@ module Service
     @@init
   end
 
-  def self.init : Systemd.class | OpenRC.class
+  def init : Systemd.class | OpenRC.class
     init? || raise "Unsupported init system"
   end
 
-  def self.exec?(command : String, args : Array(String) | Tuple) : Bool
+  def exec?(command : String, args : Array(String) | Tuple) : Bool
     success = false
     Exec.new command, args, output: DPPM::Log.output, error: DPPM::Log.error do |process|
       success = process.wait.success?