LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change d9 to b9 in b9 scripts

Browse Source
This commit is contained in:
Justin Dray 2016-02-23 16:30:37 +10:00
parent 7e73912d2d
commit bf388a9e2d
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b9/lib/deploy.sh
View File

@ -145,7 +145,7 @@ _b9_deploy_upload_from_gcs() {
local SERVER=$2
local TGZ
TGZ=$(_d9_package_download_gcs $VERSION)
TGZ=$(_b9_package_download_gcs $VERSION)
local VERSIONS_DIR="/home/ubuntu/versions"
local TARGET_FILE=${VERSIONS_DIR}/$(basename $TGZ)

32
b9/lib/package.sh
View File

@ -58,11 +58,11 @@ b9_package() {
return
fi
WORKDIR=$(_d9_package_init_work_dir $VERSION)
_d9_package_sync_workdir $TYPE $WORKDIR $VERSION $SETTINGS
_d9_package_npm_install $WORKDIR
_d9_package_cleanup_workdir $WORKDIR
_d9_package_upload $STORAGE $WORKDIR $VERSION
WORKDIR=$(_b9_package_init_work_dir $VERSION)
_b9_package_sync_workdir $TYPE $WORKDIR $VERSION $SETTINGS
_b9_package_npm_install $WORKDIR
_b9_package_cleanup_workdir $WORKDIR
_b9_package_upload $STORAGE $WORKDIR $VERSION
echo $VERSION
}
@ -79,7 +79,7 @@ _b9_package_init_git_cache() {
popd &> /dev/null
}
_d9_package_init_work_dir() {
_b9_package_init_work_dir() {
local VERSION=$1
mktemp -d b9-package-${VERSION}-XXXXXXXXXXXXX --tmpdir=$TMP
}
@ -116,17 +116,17 @@ _b9_package_is_cached() {
esac
}
_d9_package_upload() {
_b9_package_upload() {
local STORAGE=$1
local WORKDIR=$2
local VERSION=$3
case $STORAGE in
gcs)
_d9_package_upload_gcs $WORKDIR $VERSION
_b9_package_upload_gcs $WORKDIR $VERSION
;;
docker)
_d9_package_upload_docker $WORKDIR $VERSION
_b9_package_upload_docker $WORKDIR $VERSION
;;
*)
exit 1
@ -136,7 +136,7 @@ _d9_package_upload() {
mv $WORKDIR $TMP/$VERSION
}
_d9_package_sync_workdir() {
_b9_package_sync_workdir() {
local TYPE=$1
local WORKDIR=$2
local VERSION=$3
@ -144,10 +144,10 @@ _d9_package_sync_workdir() {
case $TYPE in
newclient)
_d9_package_sync_workdir_newclient $WORKDIR $VERSION $SETTINGS
_b9_package_sync_workdir_newclient $WORKDIR $VERSION $SETTINGS
;;
docker)
_d9_package_sync_workdir_docker $WORKDIR $VERSION $SETTINGS
_b9_package_sync_workdir_docker $WORKDIR $VERSION $SETTINGS
;;
*)
exit 1
@ -155,7 +155,7 @@ _d9_package_sync_workdir() {
esac
}
_d9_package_npm_install() {
_b9_package_npm_install() {
local WORKDIR=$1
pushd $WORKDIR &> /dev/null
@ -163,20 +163,20 @@ _d9_package_npm_install() {
popd &> /dev/null
}
_d9_package_cleanup_workdir() {
_b9_package_cleanup_workdir() {
local WORKDIR=$1
local REVISION
[ -z "$WORKDIR" ] && return 1
pushd $WORKDIR &> /dev/null
_d9_package_patch_package_json
_b9_package_patch_package_json
rm -rf .git build bin local
popd &> /dev/null
}
_d9_package_patch_package_json() {
_b9_package_patch_package_json() {
[ ! -d .git ] && return 0
REVISION=$(git rev-parse HEAD)

6
b9/lib/package_service_docker.sh
View File

@ -1,4 +1,4 @@
_d9_package_sync_workdir_docker() {
_b9_package_sync_workdir_docker() {
local WORKDIR=$1
local VERSION=$2
local SETTINGS=$3
@ -29,8 +29,8 @@ _b9_package_docker_init_source() {
rm -rf $WORKDIR
mkdir -p $SOURCE
_d9_package_sync_workdir_newclient $SOURCE $VERSION $SETTINGS
_d9_package_npm_install $SOURCE
_b9_package_sync_workdir_newclient $SOURCE $VERSION $SETTINGS
_b9_package_npm_install $SOURCE
}
_b9_package_docker_init_workdir() {

2
b9/lib/package_service_newclient.sh
View File

@ -1,4 +1,4 @@
_d9_package_sync_workdir_newclient() {
_b9_package_sync_workdir_newclient() {
local WORKDIR=$1
local VERSION=$2
local HASH

2
b9/lib/package_storage_docker.sh
View File

@ -41,7 +41,7 @@ _b9_package_is_cached_docker() {
_b9_dockerize_has_tag c9 $TAG
}
_d9_package_upload_docker() {
_b9_package_upload_docker() {
local WORKDIR=$1
local VERSION=$2

4
b9/lib/package_storage_gcs.sh
View File

@ -3,7 +3,7 @@ _b9_package_is_cached_gcs() {
gsutil ls gs://cloud9_ci_cache/$(basename $VERSION).tar.xz &> /dev/null
}
_d9_package_upload_gcs() {
_b9_package_upload_gcs() {
local WORKDIR=$1
local VERSION=$2
@ -20,7 +20,7 @@ _d9_package_upload_gcs() {
popd &> /dev/null
}
_d9_package_download_gcs() {
_b9_package_download_gcs() {
local VERSION=$1
local CACHE_FILE=$TMP/${VERSION}.tar.xz