Resolved merge conflict.
This commit is contained in:
		
							
								
								
									
										5
									
								
								.install/Soulblaze.sh
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								.install/Soulblaze.sh
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,5 @@
 | 
			
		||||
check_architecture x86_64
 | 
			
		||||
get_installer "soulblaze-linux-beta.zip" "https://sword-and-quill.itch.io/soulblaze"
 | 
			
		||||
mkdir -p "${installPath}/Soulblaze"
 | 
			
		||||
unzip -d "${installPath}/Soulblaze" "${cache}/soulblaze-linux-beta.zip"
 | 
			
		||||
add_launcher "${installPath}/Soulblaze/Soulblaze.x86_64"
 | 
			
		||||
@@ -61,10 +61,10 @@ check_update() {
 | 
			
		||||
    dialog --backtitle "Linux Game manager" \
 | 
			
		||||
        --yesno "Updates are available. Would you like to update now?" -1 -1 --stdout || return
 | 
			
		||||
    # Store the current commit before pulling
 | 
			
		||||
    local before_pull=$(git rev-parse HEAD)
 | 
			
		||||
    local beforePull=$(git rev-parse HEAD)
 | 
			
		||||
    git pull
 | 
			
		||||
    # Show changes between the stored commit and current HEAD
 | 
			
		||||
    git log "$before_pull..HEAD" --pretty=format:'%an: %s'
 | 
			
		||||
    git log "$beforePull..HEAD" --pretty=format:'%an: %s' | tac
 | 
			
		||||
    exit $?
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -550,6 +550,8 @@ game_launcher() {
 | 
			
		||||
                    else
 | 
			
		||||
                        exec ${game}
 | 
			
		||||
                    fi
 | 
			
		||||
                else
 | 
			
		||||
                    exec ${game}
 | 
			
		||||
                fi
 | 
			
		||||
            ;;
 | 
			
		||||
    esac
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user