aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2013-01-27 15:00:27 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2013-01-27 15:00:27 +0100
commite1daac32c5b7ca0d902c16135d361aa5303f5124 (patch)
tree3ebe514ae823d23b26c96d8d2db9c6b97e191de4 /bin
parent11c930f71db58201994265b71a8f76187f1dbda1 (diff)
downloadapp.sh-e1daac32c5b7ca0d902c16135d361aa5303f5124.tar.gz
app.sh-e1daac32c5b7ca0d902c16135d361aa5303f5124.tar.bz2
app.sh-e1daac32c5b7ca0d902c16135d361aa5303f5124.tar.xz
app.sh-e1daac32c5b7ca0d902c16135d361aa5303f5124.zip
o Creating an initial version of install-file.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/app-init4
-rwxr-xr-xbin/pid-method113
2 files changed, 3 insertions, 114 deletions
diff --git a/bin/app-init b/bin/app-init
index cca82e1..d61f989 100755
--- a/bin/app-init
+++ b/bin/app-init
@@ -48,7 +48,7 @@ fi
# TODO: install a trap handler and rm -rf "$dir"
-resolver=`grep_path "/app-resolver-$resolver_name$" "$PATH:$APPSH_HOME/libexec" | head -n 1`
+resolver=`grep_path "/app-resolver-$resolver_name$" "$PATH" | head -n 1`
if [ -z "$resolver" ]
then
@@ -75,3 +75,5 @@ fi
echo "Resolved version to $version"
"$resolver" download-version -v "$version" -f .app/latest.zip
+
+app-install-file -v "$version" -f .app/latest.zip
diff --git a/bin/pid-method b/bin/pid-method
deleted file mode 100755
index 29f6b4f..0000000
--- a/bin/pid-method
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash -e
-
-set -u
-
-. $APPSH_HOME/.app/lib/app-conf
-
-pid_file=$APPSH_APPS/.app/var/pid/$APPSH_NAME-$APPSH_INSTANCE.pid
-bin=`get_conf $APPSH_APPS $APPSH_NAME $APPSH_INSTANCE app.bin`
-
-cd $APPSH_APPS/$APPSH_NAME/$APPSH_INSTANCE/current
-
-if [ -z "$bin" ]
-then
- echo "Missing required configuration: app.bin." >&2
- exit 1
-fi
-
-if [ ! -r "$bin" ]
-then
- echo "No such file: $bin" >&2
- exit 1
-fi
-
-chmod +x "$bin"
-
-PID=
-if [ -r $pid_file ]
-then
- PID="`cat $pid_file`"
-fi
-
-do_status() {
- if [ -z "$PID" ]
- then
- echo stopped
- else
- if [ `ps -p "$PID" 2>/dev/null | wc -l` -gt 1 ]
- then
- echo running
- else
- echo crashed
- fi
- fi
-}
-
-method_start() {
- case `do_status` in
- running)
- echo "The application is already running as $PID."
- exit 1
- ;;
- esac
-
- $bin <&- 1<&- 2<&- &
-
- PID=$!
- echo "Application launched as $PID"
- echo $PID > $pid_file
-
- return 0
-}
-
-method_stop() {
- case `do_status` in
- stopped)
- echo "The application not running."
- exit 1
- ;;
- crashed)
- echo "The application crashed. Was running as $PID"
- # TODO: should this remove the PID file?
- # That makes it possible to run "stop" to stop "status" from showing "crashed"
- exit 1
- ;;
- esac
-
- signal="-9"
- echo -n "Sending kill $signal to $PID, waiting for shutdown"
- kill $signal $PID
-
- while [ "`do_status`" == "running" ]
- do
- sleep 1
- echo -n "."
- done
-
- echo " OK"
- rm -f $pid_file
- return 0
-}
-
-method_status() {
- case `do_status` in
- running)
- echo "$APPSH_NAME/$APPSH_INSTANCE is running as $PID"
- ;;
- stopped)
- echo "$APPSH_NAME/$APPSH_INSTANCE is not running"
- ;;
- crashed)
- echo "$APPSH_NAME/$APPSH_INSTANCE crashed. Was running as $PID"
- ;;
- esac
-}
-
-case "$APPSH_METHOD" in
- start) method_start ;;
- stop) method_stop ;;
- status) method_status ;;
- *) exit 1 ;;
-esac
-
-exit $?