mirror of
				https://github.com/avatao-content/test-tutorial-framework
				synced 2025-11-04 08:52:56 +00:00 
			
		
		
		
	Fix try_build_baseimage in tfw.sh
This commit is contained in:
		@@ -8,11 +8,6 @@ libhack_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 | 
			
		||||
source "${libhack_dir}/common.sh"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
baseimage::build_if_exists() {
 | 
			
		||||
    [[ ! -d "${BASEIMAGE_PATH}" ]] && return ||:
 | 
			
		||||
    baseimage::build
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
baseimage::build() {
 | 
			
		||||
    baseimage::assert_exists
 | 
			
		||||
    pushd "${BASEIMAGE_PATH}"
 | 
			
		||||
@@ -26,12 +21,16 @@ baseimage::build() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
baseimage::assert_exists() {
 | 
			
		||||
    if [[ ! -d "${BASEIMAGE_PATH}" ]]; then
 | 
			
		||||
    if ! baseimage::check_exists; then
 | 
			
		||||
        printf "Cannot find baseimage at ${BASEIMAGE_PATH}!\n"
 | 
			
		||||
        exit 1
 | 
			
		||||
    fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
baseimage::check_exists() {
 | 
			
		||||
    [[ -d "${BASEIMAGE_PATH}" ]]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
baseimage::release() {
 | 
			
		||||
    baseimage::assert_exists
 | 
			
		||||
    pushd "${BASEIMAGE_PATH}"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										13
									
								
								hack/tfw.sh
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								hack/tfw.sh
									
									
									
									
									
								
							@@ -21,18 +21,17 @@ source "${SCRIPT_DIR}/libhack/challenge.sh"
 | 
			
		||||
source "${SCRIPT_DIR}/libhack/frontend.sh"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
try_build_baseimage() {
 | 
			
		||||
    if baseimage::check_exists; then
 | 
			
		||||
        build_baseimage
 | 
			
		||||
    fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
build_baseimage() {
 | 
			
		||||
    frontend_version="$(frontend::latest_tag)"
 | 
			
		||||
    baseimage::build
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
try_build_baseimage() {
 | 
			
		||||
    frontend_version="$(frontend::latest_tag)"
 | 
			
		||||
    baseimage::build_if_exists
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
case ${1:-} in
 | 
			
		||||
    start)
 | 
			
		||||
        try_build_baseimage
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user