Skip to content

Commit

Permalink
Updated installation implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
Fulgurance committed Aug 14, 2024
1 parent f98457a commit 7cbfa43
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions ISM/Software.cr
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ module ISM
def makeSource(arguments = String.new, path = String.new, environment = Hash(String, String).new, environmentFilePath = String.new, makeOptions = String.new, buildOptions = String.new)

if Ism.settings.installByChroot
prefix = "#{makeOptions == "" ? Ism.settings.chrootMakeOptions : makeOptions}"
prefix = "#{makeOptions == "" ? Ism.settings.chrootMakeOptions : makeOptions}"

if !environment.has_key?("CFLAGS")
environment["CFLAGS"] = "#{buildOptions == "" ? Ism.settings.chrootBuildOptions : buildOptions}"
Expand Down Expand Up @@ -1376,11 +1376,7 @@ module ISM
installedFiles << "/#{finalDestination.sub(Ism.settings.rootPath,"")}".squeeze("/")
end
else
#Delete existing file instead of overriding it to avoid any crash
if File.exists?(finalDestination)
deleteFileNoChroot(finalDestination)
end

#Use install to avoid any crash ?
moveFileNoChroot(entry,finalDestination)

installedFiles << "/#{finalDestination.sub(Ism.settings.rootPath,"")}".squeeze("/")
Expand Down

0 comments on commit 7cbfa43

Please sign in to comment.