pkgr 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8286cde02aee6871c83a01b3e4bde67d7e2c064d
-  data.tar.gz: 7e835d88af2324a41ec228e5493acf6f4e1b52cf
+  metadata.gz: a4e3a70c418cef9f50841398e35eed52f1101f85
+  data.tar.gz: 8820bd24da8af9c77431e512b4deeb275c4f8a65
 SHA512:
-  metadata.gz: 7a275a87b5c5b14ffbf62d0740dfae27474b4dab84ed184c06a456170a8b5758b22fa7f0329f847f06901d3e521c1f46a3c9430512f07af09db84acdc0d58d2d
-  data.tar.gz: 20d5a23367770c6aab4a61f0d73fb4829c98d1f55258d59647642777e60e165c3dda87730e00d3f8b3d7b4ba5afe75d5fdeec81b239a11b4647f352761209bd4
+  metadata.gz: acfb11a093245ef31b8f53e29014e229f8dd1befc90afb446e829f8e2ec0825ad0aa13e38c2901cb5b74dc0bc0f9196b9ac116e69aa244a9236e7dcb07465ffe
+  data.tar.gz: a70f79e56a29d9523178e4907dff16d36996b3b725a04c269520fa61e94ed1f6a2daef33e72419fce743eb177943f8ab0f34d01540250fb42193a84dbea94766

data/data/cli/cli.sh.erb

@@ -34,16 +34,16 @@ DEFAULT_FILE=$(_p "/etc/default/${APP_NAME}")
 
 for file in $(_p "${APP_HOME}/.profile.d")/*.sh; do
   # .profile.d scripts assume HOME indicates the path to the app directory
-  if [ -f $file ]; then HOME=${APP_HOME} . $file; fi
+  if [ -f $file ]; then HOME=${APP_HOME} . $file &>/dev/null; fi
 done
 
 if [ "$APP_CLI" != "" ] ; then
   exec $APP_HOME/bin/$APP_CLI "$@"
 fi
 
-if [ `id -u` -ne 0 ]; then
-  echo "You must be executing with root privileges to launch commands."
-  echo "Either log in as root, use sudo, or add sudo privileges for running ${APP_NAME} with your user."
+if [ ! -w "$(_p "/etc/${APP_NAME}/conf.d")" ] ; then
+  echo "Error: You must be executing as the user '${APP_USER}' or with root privileges to launch commands."
+  echo "Either log in as '${APP_USER}', root, use sudo, or add sudo privileges for running ${APP_NAME} with your current user."
   exit 1
 fi
 
@@ -53,6 +53,15 @@ for file in $(_p "/etc/${APP_NAME}/conf.d")/*; do
   if [ -f $file ]; then . $file; fi
 done
 
+# Some actions require root privileges
+ensure_root() {
+  if [ $(id -u) -ne 0 ]; then
+    echo "Error: You must be executing with root privileges to use this command."
+    echo "Either log in as root, use sudo, or add sudo privileges for running ${APP_NAME} with your user."
+    exit 1
+  fi
+}
+
 # Return all the environment variables accessible to the app.
 show_env() {
   env -i ROOT_PATH=${ROOT_PATH} ${0} run env | sort
@@ -260,11 +269,18 @@ while : ; do
       # Do not use su, to avoid creating a new process. Note: chroot version
       # is too old on Ubuntu Lucid, so this will fail. It works on Debian
       # Squeeze though (and later).
-      exec chroot --userspec ${APP_USER}:${APP_GROUP} "/" sh -c "cd $(_p ${APP_HOME}) && $runnable"
+      # Do not chroot if current user is APP_USER.
+      if [ $(id -u) = $(id -u ${APP_USER}) ]; then
+        exec sh -c "cd $(_p ${APP_HOME}) && $runnable"
+      else
+        exec chroot --userspec ${APP_USER}:${APP_GROUP} "/" sh -c "cd $(_p ${APP_HOME}) && $runnable"
+      fi
 
       break ;;
 
     scale)
+      ensure_root
+
       shift
       for arg in "$@"; do
         [ "$arg" = "" ] && usage
@@ -313,10 +329,14 @@ while : ; do
       break;;
 
     configure)
+      ensure_root
+
       configure $@
       break;;
 
     reconfigure)
+      ensure_root
+
       reconfigure $@
       break;;
 

data/lib/pkgr/version.rb

@@ -1,3 +1,3 @@
 module Pkgr
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkgr
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake