Skip to content

Commit

Permalink
disable snappy, second attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
jrobinso committed Sep 9, 2024
1 parent c265c9d commit 4521c92
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 2 additions & 0 deletions scripts/igv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ java -version
if [ -e "$HOME/.igv/java_arguments" ]; then
java --module-path="${prefix}/lib" -Xmx8g \
@"${prefix}/igv.args" \
-Dsamjdk.snappy.disable=true \
-Dapple.laf.useScreenMenuBar=true \
-Djava.net.preferIPv4Stack=true \
-Djava.net.useSystemProxies=true \
Expand All @@ -34,6 +35,7 @@ if [ -e "$HOME/.igv/java_arguments" ]; then
else
java --module-path="${prefix}/lib" -Xmx8g \
@"${prefix}/igv.args" \
-Dsamjdk.snappy.disable=true \
-Dapple.laf.useScreenMenuBar=true \
-Djava.net.preferIPv4Stack=true \
-Djava.net.useSystemProxies=true \
Expand Down
4 changes: 2 additions & 2 deletions scripts/igvtools
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ fi

# Check if there is a user-specified Java arguments file
if [ -e "$HOME/.igv/java_arguments" ]; then
java -showversion -Djava.awt.headless=true --module-path="${prefix}/lib" -Xmx1500m \
java -showversion -Djava.awt.headless=true -Dsamjdk.snappy.disable=true --module-path="${prefix}/lib" -Xmx1500m \
@"${prefix}/igv.args" \
@"$HOME/.igv/java_arguments" \
--module=org.igv/org.broad.igv.tools.IgvTools "$@"
else
java -showversion -Djava.awt.headless=true --module-path="${prefix}/lib" -Xmx1500m \
java -showversion -Djava.awt.headless=true -Dsamjdk.snappy.disable=true --module-path="${prefix}/lib" -Xmx1500m \
@"${prefix}/igv.args" \
--module=org.igv/org.broad.igv.tools.IgvTools "$@"
fi
3 changes: 0 additions & 3 deletions src/main/java/org/broad/igv/ui/IGV.java
Original file line number Diff line number Diff line change
Expand Up @@ -1884,9 +1884,6 @@ public void run() {

final IGVPreferences preferences = PreferencesManager.getPreferences();

// Disable "snappy", used by htsjdk for sorting but not supported by IGV
System.setProperty("snappy.disable", "true");

// Start CommandsServer **before** loading the initial genome, as credentials might need to be set for
// privately hosted genomes.
startCommandsServer(igvArgs, preferences);
Expand Down

0 comments on commit 4521c92

Please sign in to comment.