mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 12:11:15 -06:00 
			
		
		
		
	merge upstream changes (#25)
* Add sigxcpu76's fix to force use of light GTK theme When using Bambu Studio with a dark themed Linux desktop, many of the dialogs appear as white text on a white background (font's correctly invert, but dialogs remain white). @sigxcpu76 provided a workaround for this in #12 which is to tell the app to use a light GTK theme. This change incorporates that workaround into the AppImage making the app more usable until such time as proper dark theme support can be added to Bambu Studio. * Update Containerfile to make it Docker compatible - Replace COPY command with Docker compatible syntax - Rename container tag to bambu-studio-builder so as to not confuse with a container that would actually run Bambu Studio - Add Docker alternative build method (thx @SG-R) - Update podman syntax to remove unnecessary sudo * Add check_available_memory_and_disk to BuildLinux.sh * Fixes #740 Removing check for local or Remote FX virtualized RDP session. The checks below this line already verify if proper OpenGL support is present. Co-authored-by: deftdawg <deftdawg@gmail.com> Co-authored-by: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									cad4caaf5b
								
							
						
					
					
						commit
						ea5c88e36f
					
				
					 4 changed files with 34 additions and 7 deletions
				
			
		|  | @ -7,6 +7,26 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES} | |||
| FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2) | ||||
| FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3) | ||||
| 
 | ||||
| function check_available_memory_and_disk() { | ||||
|     FREE_MEM_GB=$(free -g -t | grep 'Mem:' | rev | cut -d" " -f1 | rev) | ||||
|     MIN_MEM_GB=10 | ||||
| 
 | ||||
|     FREE_DISK_KB=$(df -k . | tail -1 | awk '{print $4}') | ||||
|     MIN_DISK_KB=$((10 * 1024 * 1024)) | ||||
| 
 | ||||
|     if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then | ||||
|         echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)" | ||||
|         echo && free -h && echo | ||||
|         exit 2 | ||||
|     fi | ||||
| 
 | ||||
|     if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then  | ||||
|         echo -e "\nERROR: Bambu Studio Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)" | ||||
|         echo && df -h . && echo | ||||
|         exit 1 | ||||
|     fi | ||||
| } | ||||
| 
 | ||||
| unset name | ||||
| while getopts ":dsiuhgb" opt; do | ||||
|   case ${opt} in | ||||
|  | @ -133,6 +153,8 @@ then | |||
|     mkdir deps/build | ||||
| fi | ||||
| 
 | ||||
| check_available_memory_and_disk | ||||
| 
 | ||||
| if [[ -n "$BUILD_DEPS" ]] | ||||
| then | ||||
|     echo "[3/9] Configuring dependencies..." | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 SoftFever
						SoftFever