|
@ -71,7 +71,7 @@ fi |
|
|
git clone $GIT_0K_CLONE_OPTIONS "$GIT_0K_BASE/0k/0k-charm.git" |
|
|
git clone $GIT_0K_CLONE_OPTIONS "$GIT_0K_BASE/0k/0k-charm.git" |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
ln -sfn /opt/apps/0k-charm/bin/charm /usr/local/sbin/ |
|
|
|
|
|
|
|
|
ln -sfn /opt/apps/0k-charm/bin/charm /usr/local/sbin/charm |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -147,7 +147,7 @@ fi |
|
|
ln -sfn /opt/apps/0k-docker/bin/* /usr/local/sbin/ |
|
|
ln -sfn /opt/apps/0k-docker/bin/* /usr/local/sbin/ |
|
|
ln -sfn /opt/apps/0k-docker/bin/docker-clean /etc/cron.daily/docker-clean |
|
|
ln -sfn /opt/apps/0k-docker/bin/docker-clean /etc/cron.daily/docker-clean |
|
|
## in update, will remove broken links to binaries that were removed |
|
|
## in update, will remove broken links to binaries that were removed |
|
|
find -L /usr/local/sbin -maxdepth 1 -type l -delete |
|
|
|
|
|
|
|
|
find -L /usr/local/sbin -maxdepth 1 -type l -ilname /opt/apps/0k-docker/\* -delete |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -207,7 +207,7 @@ else |
|
|
mkdir -p /opt/apps && cd /opt/apps |
|
|
mkdir -p /opt/apps && cd /opt/apps |
|
|
git clone "$GIT_0K_BASE"/0k/0k-compose.git |
|
|
git clone "$GIT_0K_BASE"/0k/0k-compose.git |
|
|
fi |
|
|
fi |
|
|
[ -e /usr/local/bin/compose ] || ln -sfv /opt/apps/0k-compose/bin/compose /usr/local/bin/ |
|
|
|
|
|
|
|
|
[ -e /usr/local/bin/compose ] || ln -sfnv /opt/apps/0k-compose/bin/compose /usr/local/bin/ |
|
|
rm -rf /var/cache/compose |
|
|
rm -rf /var/cache/compose |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -253,8 +253,8 @@ fi |
|
|
git checkout master |
|
|
git checkout master |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
ln -sf /opt/apps/0k-pgm/bin/* /usr/local/bin/ |
|
|
|
|
|
|
|
|
ln -sfnv /opt/apps/0k-pgm/bin/* /usr/local/bin/ |
|
|
|
|
|
find -L /usr/local/bin -maxdepth 1 -type l -ilname /opt/apps/0k-pgm/bin/\* -delete |
|
|
apt-get install -y --force-yes pv buffer < /dev/null |
|
|
apt-get install -y --force-yes pv buffer < /dev/null |
|
|
apt-get install -y postgresql-client </dev/null |
|
|
apt-get install -y postgresql-client </dev/null |
|
|
|
|
|
|
|
|
) |
|
|
) |